X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=d1c837bad9cf799193fb8f4fee841d7ae48247a6;hb=f9fab3f48990c93fd9a43dc98bb3613a847b6358;hp=4b4171fd74bc4f52e3756b40f1f99259391e2307;hpb=322fe8c316efdb0e5844898f439bbb0cfdc52fb3;p=plcapi.git

diff --git a/Makefile b/Makefile
index 4b4171f..d1c837b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 # Makefile for phpxmlrpc library
-# $Id: Makefile,v 1.37 2008/03/06 22:37:19 ggiunta Exp $
 
 ### USER EDITABLE VARS ###
 
@@ -12,7 +11,7 @@ PHPINCLUDEDIR=/usr/local/lib/php
 # mkdir is a thorny beast under windows: make sure we can not use the cmd version, running eg. "make MKDIR=mkdir.exe"
 MKDIR=mkdir
 
-#find too
+# find too
 FIND=find
 
 
@@ -21,7 +20,7 @@ FIND=find
 # recover version number from code
 # thanks to Firman Pribadi for unix command line help
 #   on unix shells lasts char should be \\2/g )
-export VERSION=$(shell egrep "\$GLOBALS *\[ *'xmlrpcVersion' *\] *= *'" lib/xmlrpc.inc | sed -r s/"(.*= *' *)([0-9a-zA-Z.-]+)(.*)"/\2/g )
+export VERSION=$(shell grep -E "\$GLOBALS *\[ *'xmlrpcVersion' *\] *= *'" lib/xmlrpc.inc | sed -r s/"(.*= *' *)([0-9a-zA-Z.-]+)(.*)"/\2/g )
 
 LIBFILES=lib/xmlrpc.inc lib/xmlrpcs.inc lib/xmlrpc_wrappers.inc
 
@@ -70,7 +69,7 @@ DEBUGGERFILES=debugger/index.php \
 all: install
 
 install:
-	cd lib && cp ${LIBFILES} ${PHPINCLUDEDIR}
+	cp ${LIBFILES} ${PHPINCLUDEDIR}
 	@echo Lib files have been copied to ${PHPINCLUDEDIR}
 	cd doc && $(MAKE) install
 
@@ -109,7 +108,7 @@ xmlrpc-${VERSION}.zip xmlrpc-${VERSION}.tar.gz: ${LIBFILES} ${DEBUGGERFILES} ${I
 	cp ${INFOFILES} xmlrpc-${VERSION}
 	cd doc && $(MAKE) dist
 #   on unix shells last char should be \;
-	${FIND} xmlrpc-${VERSION} -type f ! -name "*.fttb" ! -name "*.pdf" ! -name "*.gif" -exec dos2unix {} ;
+	${FIND} xmlrpc-${VERSION} -type f ! -name "*.fttb" ! -name "*.pdf" ! -name "*.gif" -exec dos2unix "{}" \;
 	-rm xmlrpc-${VERSION}.zip xmlrpc-${VERSION}.tar.gz
 	tar -cvf xmlrpc-${VERSION}.tar xmlrpc-${VERSION}
 	gzip xmlrpc-${VERSION}.tar