*** ./Makefile.orig Tue May 14 18:25:44 2002 --- ./Makefile Tue May 14 18:31:36 2002 *************** *** 1,7 **** --- 1,14 ---- # # PostGIS Loader Makefile # + SHELL = /bin/sh + subdir = contrib/postgis/loader + EXE = + + ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) + EXE = .exe + endif # Root of the pgsql source tree ifeq (${PGSQL_SRC},) *************** *** 18,35 **** override CPPFLAGS := -g -I$(srcdir) -I$(top_builddir)/src/interfaces/libpq $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"' ! all: shp2pgsql pgsql2shp ! pgsql2shp: $(OBJS) pgsql2shp.o $(CC) $(CFLAGS) $(OBJS) pgsql2shp.o $(libpq) $(LDFLAGS) $(LIBS) -o $@ ! shp2pgsql: $(OBJS) shp2pgsql.o $(CC) $(CFLAGS) $(OBJS) shp2pgsql.o $(libpq) $(LDFLAGS) $(LIBS) -o $@ install: all ! $(INSTALL_PROGRAM) pgsql2shp $(bindir) ! $(INSTALL_PROGRAM) shp2pgsql $(bindir) clean: ! @rm -f $(OBJS) shp2pgsql.o pgsql2shp.o shp2pgsql pgsql2shp --- 25,42 ---- override CPPFLAGS := -g -I$(srcdir) -I$(top_builddir)/src/interfaces/libpq $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"' ! all: shp2pgsql$(EXE) pgsql2shp$(EXE) ! pgsql2shp$(EXE): $(OBJS) pgsql2shp.o $(CC) $(CFLAGS) $(OBJS) pgsql2shp.o $(libpq) $(LDFLAGS) $(LIBS) -o $@ ! shp2pgsql$(EXE): $(OBJS) shp2pgsql.o $(CC) $(CFLAGS) $(OBJS) shp2pgsql.o $(libpq) $(LDFLAGS) $(LIBS) -o $@ install: all ! $(INSTALL_PROGRAM) pgsql2shp$(EXE) $(bindir)/pgsql2shp$(EXE) ! $(INSTALL_PROGRAM) shp2pgsql$(EXE) $(bindir)/shp2pgsql$(EXE) clean: ! @rm -f $(OBJS) shp2pgsql.o pgsql2shp.o shp2pgsql$(EXE) pgsql2shp$(EXE)