--- contrib/Makefile.orig	2010-01-04 12:08:02.000000000 +0800
+++ contrib/Makefile	2013-10-13 21:39:57.405429171 +0800
@@ -3,19 +3,36 @@
 #CFLAGS	=	-g
 
 # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
-ENDIAN	=	-D_LITTLE_ENDIAN
+#ENDIAN	=	-D_LITTLE_ENDIAN
 
-CFLAGS	=	-g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
+CFLAGS	+=	 %%ENDIAN%% %%PROJ%% -I.. -I$(LOCALBASE)/include -L$(LOCALBASE)/lib
 
 SHPOBJ	=	../shpopen.o ../dbfopen.o ../safileio.o
 
 SHPGOBJ =	../shpopen.o ../dbfopen.o ../safileio.o shpgeo.o
 
-GEOOBJ	=	./shpgeo.o -lm -L$(HOME)/bld/lib -lproj
+GEOOBJ	=	./shpgeo.o -lm -lproj
 
 default:	all
 
-all:	shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort
+#all:	shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort
+
+ALLPROG=	Shape_PointInPoly dbfcat dbfinfo shpcat shpdxf shpfix shpsort
+ALLPROJ=	shpcentrd shpdata shpinfo shpproj shpwkb
+
+.if defined(NO_PROJ4)
+all:		$(ALLPROG)
+install:	allprog_install
+.else
+all:		$(ALLPROG) $(ALLPROJ)
+install:	allprog_install allproj_install
+.endif
+
+allprog_install:	$(ALLPROG)
+	$(BSD_INSTALL_PROGRAM) $(ALLPROG) $(DESTDIR)$(PREFIX)/bin/
+
+allproj_install:	$(ALLPROJ)
+	$(BSD_INSTALL_PROGRAM) $(ALLPROJ) $(DESTDIR)$(PREFIX)/bin/
 
 clean:  
 	rm -f shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfcat dbfinfo shpinfo shpfix shpcat *.o