CVS restructuring stage 2 complete

Jeroen Ruigrok/asmodai asmodai at wxs.nl
Fri Aug 8 00:24:52 PDT 2003


rm -rf /usr/include
cd src/include
[9:00] [root at purgatory] (6) {0} # make install
install -C -o root -g wheel -m 444  a.out.h ar.h assert.h bitstring.h
complex.h ctype.h db.h dirent.h disktab.h dlfcn.h elf.h elf-hints.h
err.h fnmatch.h fstab.h fts.h glob.h grp.h strhash.h histedit.h ieeefp.h
ifaddrs.h iso646.h langinfo.h libgen.h limits.h link.h locale.h malloc.h
memory.h mpool.h ndbm.h netdb.h nl_types.h nlist.h objformat.h paths.h
pthread.h pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h
resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h
stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h strings.h
struct.h sysexits.h tar.h time.h timers.h ttyent.h unistd.h utime.h
utmp.h vis.h wchar.h wctype.h osreldate.h /usr/include
usage: install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
               [-o owner] file1 file2
       install [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
	       [-o owner] file1 ... fileN directory
       install -d [-v] [-g group] [-m mode] [-o owner] directory ...
*** Error code 64

It bails out because /usr/include doesn't exist.

Attached patch creates the appropriate directories if they do not exist.
One small caveat, mkdir is hardwired and not a make variable.

-- 
Jeroen Ruigrok van der Werven <asmodai(at)wxs.nl> / asmodai
PGP fingerprint: 2D92 980E 45FE 2C28 9DB7  9D88 97E6 839B 2EAC 625B
http://www.tendra.org/   | http://www.in-nomine.org/~asmodai/diary/
Contentment that derives from knowing when to be content is eternal
contentment...
Index: src/share/mk/bsd.incs.mk
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/share/mk/bsd.incs.mk,v
retrieving revision 1.3
diff -u -r1.3 bsd.incs.mk
--- src/share/mk/bsd.incs.mk	8 Aug 2003 04:18:41 -0000	1.3
+++ src/share/mk/bsd.incs.mk	8 Aug 2003 07:23:03 -0000
@@ -52,9 +52,15 @@
 installincludes: _${group}INS
 _${group}INS: ${_${group}INCS}
 .if defined(${group}NAME)
+        if [ ! -d ${DESTDIR}${${group}DIR}/${${group}NAME} ]; then \
+		mkdir -p ${DESTDIR}${${group}DIR}; \
+	fi 
 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
 .else
+        if [ ! -d ${DESTDIR}${${group}DIR} ]; then \
+		mkdir -p ${DESTDIR}${${group}DIR}; \
+	fi 
 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
 .endif




More information about the Kernel mailing list