small makefile tweak

[plcapi.git] / Makefile

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