[uClibc] patches to uClibc CVS Makefile

Amir Shalem amir at boom.org.il
Fri Dec 31 12:33:21 UTC 2004


Hey

here are few patches for better compatability in ./Makefile:

make.diff - make should never called directly, change it to $(MAKE)
zcat.diff - attempt to extract locale data file only if it exists.
cp.diff   - use portable way to specfic --no-dereference (-d)

the patches should apply in this order.

thanks,
--
	Amir.

-------------- next part --------------
--- Makefile.orig	Fri Dec 31 14:21:24 2004
+++ Makefile	Fri Dec 31 14:24:21 2004
@@ -123,7 +123,10 @@
 	fi );
 endif
 ifeq ($(strip $(UCLIBC_PREGENERATED_LOCALE_DATA)),y)
-	(cd extra/locale; zcat $(LOCALE_DATA_FILENAME) | tar -xvf -)
+	(cd extra/locale; \
+	if [ -f $(LOCALE_DATA_FILENAME) ] ; then \
+	zcat $(LOCALE_DATA_FILENAME) | tar -xvf -; \
+	fi );
 	$(MAKE) -C extra/locale pregen
 endif
 
-------------- next part --------------
--- Makefile.orig	Fri Dec 31 14:19:46 2004
+++ Makefile	Fri Dec 31 14:18:15 2004
@@ -67,7 +67,7 @@
 
 include/bits/uClibc_config.h: .config
 	@if [ ! -x ./extra/config/conf ] ; then \
-	    make -C extra/config conf; \
+	    $(MAKE) -C extra/config conf; \
 	fi;
 	$(RM) -r include/bits
 	$(INSTALL) -d include/bits
@@ -124,7 +124,7 @@
 endif
 ifeq ($(strip $(UCLIBC_PREGENERATED_LOCALE_DATA)),y)
 	(cd extra/locale; zcat $(LOCALE_DATA_FILENAME) | tar -xvf -)
-	make -C extra/locale pregen
+	$(MAKE) -C extra/locale pregen
 endif
 
 
@@ -268,10 +268,10 @@
 # configuration
 # ---------------------------------------------------------------------------
 extra/config/conf:
-	make -C extra/config conf
+	$(MAKE) -C extra/config conf
 
 extra/config/mconf:
-	make -C extra/config ncurses mconf
+	$(MAKE) -C extra/config ncurses mconf
 
 menuconfig: extra/config/mconf
 	$(RM) -r include/bits
-------------- next part --------------
--- Makefile.orig	Fri Dec 31 14:18:15 2004
+++ Makefile	Fri Dec 31 14:21:24 2004
@@ -231,7 +231,7 @@
 	$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib
 	$(INSTALL) -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 		$(PREFIX)$(RUNTIME_PREFIX)lib
-	cp -dRf lib/*.so.* $(PREFIX)$(RUNTIME_PREFIX)lib
+	cp -PRf lib/*.so.* $(PREFIX)$(RUNTIME_PREFIX)lib
 	@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
 	    set -x -e; \
 	    $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
@@ -346,7 +346,7 @@
 release: distclean
 	cd ..;					\
 	$(RM) -r uClibc-$(VERSION);		\
-	cp -dRf uClibc uClibc-$(VERSION);	\
+	cp -PRf uClibc uClibc-$(VERSION);	\
 	find uClibc-$(VERSION)/ -type f		\
 	    -name .\#* -exec $(RM) -r {} \; ;	\
 	find uClibc-$(VERSION)/ -type d		\
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.busybox.net/pipermail/uclibc/attachments/20041231/cefa6fab/attachment-0002.pgp 


More information about the uClibc mailing list