Merge remote-tracking branch 'l/master'

INSTALL.org

@@ -15,13 +15,15 @@ and you are done.
 
 Other possible targets include:
 
-: make install [prefix=/usr]  # install into prefix
-: make diet                   # compile with diet libc
-: make test                   # compile and run the tests
-: make doc                    # generate the API documentation (will be put in the doc folder)
-: make help                   # display the possible targets
+: make install PREFIX=/usr	# install into PREFIX
+: make install DESTDIR=/tmp/t	# install into DESTDIR
+: make diet			# compile with diet libc
+: make test			# compile and run the tests
+: make doc			# generate the API documentation using doxygen
+				# (will be put in the doc folder)
+: make help			# display the possible targets
 
 On BSD try this:
 
-: sudo gmake install prefix=/usr/local
+: sudo gmake install PREFIX=/usr/local
 

Makefile

@@ -1,6 +1,8 @@
 .PHONY: doc test bench
 .NOTPARALLEL: clean
 
+export PREFIX="$(DESTDIR)/usr"
+
 indent_args = -nbad -bap -bbo -nbc -br -brs -ncdb -cdw -ce -ci4 -cli0 -cs -d0 -di1 \
 -nfc1 -nfca -hnl -i4 -ip0 -l80 -lp -npcs -nprs -npsl -saf -sai -saw -nsc -nsob -nss
 
@@ -9,15 +11,31 @@ all:
 
 it: all
 
+destdir:
+	-@if test "foo$(DESTDIR)" != "foo" ; then \
+	    mkdir "$(DESTDIR)" ;\
+	fi
+	@if test "foo$(PREFIX)" = "foo" ; then \
+            echo "libpsyc install: You must provide a PREFIX=/usr or such." ;\
+	    exit 2 ;\
+	else true; fi
+	-@if [ ! -w "$(PREFIX)" ]; then \
+	    mkdir "$(PREFIX)" ;\
+	fi
+	@if [ ! -w "$(PREFIX)" ]; then \
+            echo "libpsyc install: You must provide a writable PREFIX." ;\
+	    exit 2 ;\
+	else true; fi
+
 install: install-lib install-inc install-d
 
-install-lib: all
+install-lib: destdir all
 	${MAKE} -C lib install
 
-install-inc: all
+install-inc: destdir all
 	${MAKE} -C include install
 
-install-d: all
+install-d: destdir all
 	${MAKE} -C d install
 
 debug:

d/include/psyc/Makefile

@@ -1,5 +1,4 @@
-prefix = /usr
-includedir = ${prefix}/include/d
+includedir = ${PREFIX}/include/d
 
 INSTALL = install
 HEADERS = common.d parse.d

include/Makefile

@@ -1,5 +1,4 @@
-prefix = /usr
-includedir = ${prefix}/include
+includedir = ${PREFIX}/include
 
 INSTALL = install
 HEADERS = psyc.h

include/psyc/Makefile

@@ -1,7 +1,4 @@
-# Why do we have a Makefile in the include directory?
-
-prefix = /usr
-includedir = ${prefix}/include
+includedir = ${PREFIX}/include
 
 INSTALL = install
 HEADERS = match.h method.h packet.h parse.h render.h text.h uniform.h variable.h

lib/Makefile

@@ -1,5 +1,4 @@
-prefix = /usr
-libdir = ${prefix}/lib
+libdir = ${PREFIX}/lib
 
 INSTALL = install
 LIBS = libpsyc.a libpsyc.so