svn commit: r254273 - in head: . include lib lib/libc/iconv lib/libiconv_compat lib/libkiconv share/mk sys/sys tools/build/mk

[Jilles Tjoelker]

On Thu, Sep 05, 2013 at 10:15:40PM +0200, Joel Dahl wrote:
> Installworld is still broken on systems with readonly /usr/obj.

I use this. It makes the mapper.dir and similar files depend on their
actual sources instead of phony targets, and therefore only rebuilt when
needed.

Index: share/i18n/csmapper/Makefile
===================================================================
--- share/i18n/csmapper/Makefile	(revision 255496)
+++ share/i18n/csmapper/Makefile	(working copy)
@@ -6,7 +6,16 @@
 SUBDIR=	APPLE AST BIG5 CNS CP EBCDIC GB GEORGIAN ISO646 ISO-8859 JIS \
 	KAZAKH KOI KS MISC TCVN
 
-mapper.dir: ${SUBDIR}
+.for i in ${SUBDIR}
+${i}/mapper.dir.${i}:
+	${MAKE} -C ${.CURDIR}/${i} all
+mapper.dir: ${i}/mapper.dir.${i}
+${i}/charset.pivot.${i}:
+	${MAKE} -C ${.CURDIR}/${i} all
+charset.pivot: ${i}/charset.pivot.${i}
+.endfor
+
+mapper.dir:
 	> ${.TARGET}
 .for i in ${SUBDIR}
 	cat ${i}/mapper.dir.${i} >> ${.TARGET}
@@ -17,7 +26,7 @@
 FILES+=	mapper.dir mapper.dir.db
 CLEANFILES+= mapper.dir mapper.dir.db
 
-charset.pivot: ${SUBDIR}
+charset.pivot:
 	> ${.TARGET}
 .for i in ${SUBDIR}
 	cat ${i}/charset.pivot.${i} >> ${.TARGET}
Index: share/i18n/esdb/Makefile
===================================================================
--- share/i18n/esdb/Makefile	(revision 255496)
+++ share/i18n/esdb/Makefile	(working copy)
@@ -9,7 +9,16 @@
 FILES+=	esdb.dir esdb.dir.db esdb.alias esdb.alias.db
 CLEANFILES= ${FILES}
 
-esdb.dir: ${SUBDIR}
+.for i in ${SUBDIR}
+${i}/esdb.dir.${i}:
+	${MAKE} -C ${.CURDIR}/${i} all
+esdb.dir: ${i}/esdb.dir.${i}
+${i}/esdb.alias.${i}:
+	${MAKE} -C ${.CURDIR}/${i} all
+esdb.alias: ${i}/esdb.alias.${i}
+.endfor
+
+esdb.dir:
 	> $@
 .for i in ${SUBDIR}
 	cat ${i}/esdb.dir.${i} >>${.TARGET}
@@ -17,7 +26,7 @@
 esdb.dir.db: esdb.dir
 	${MKESDB} -m -o ${.TARGET} ${.ALLSRC}
 
-esdb.alias: ${SUBDIR}
+esdb.alias:
 	> $@
 .for i in ${SUBDIR}
 	cat ${i}/esdb.alias.${i} >>${.TARGET}

-- 
Jilles Tjoelker