Subject: Re: Installing into DESTDIR
To: Charles M. Hannum <mycroft@gnu.ai.mit.edu>
From: Giles Lean <giles@nemeton.com.au>
List: current-users
Date: 12/13/1994 08:28:40
On Sun, 11 Dec 1994 07:15:09 -0500  "Charles M. Hannum" wrote:


>    2	In bsd.dep.mk AINC isn't used when depending C & C++ files so
> 	   /usr/include is sought instead of $DESTDIR/usr/include.

> It's not supposed to.  That's why sys.mk modifies CPPFLAGS.

Then probably bsd.dep.mk should too.  After doing this locally
'make depend' and 'make' both work, except for a few subsidiary
makefiles with further problems.

If this fix is OK, I'll send diffs for the various makefiles as
well.

Ciao,

Giles

===================================================================
RCS file: RCS/bsd.dep.mk,v
retrieving revision 1.1
diff -c -r1.1 bsd.dep.mk
*** 1.1	1994/12/10 10:55:06
--- bsd.dep.mk	1994/12/12 09:42:29
***************
*** 8,22 ****
  	rm -f .depend
  	files="${.ALLSRC:M*.s} ${.ALLSRC:M*.S}"; \
  	if [ "$$files" != " " ]; then \
! 	  mkdep -a ${MKDEP} ${CFLAGS:M-[ID]*} ${AINC} $$files; \
  	fi
  	files="${.ALLSRC:M*.c}"; \
  	if [ "$$files" != "" ]; then \
! 	  mkdep -a ${MKDEP} ${CFLAGS:M-[ID]*} $$files; \
  	fi
  	files="${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cxx}"; \
  	if [ "$$files" != "  " ]; then \
! 	  mkdep -a ${MKDEP} -+ ${CXXFLAGS:M-[ID]*} $$files; \
  	fi
  .else
  .depend:
--- 8,22 ----
  	rm -f .depend
  	files="${.ALLSRC:M*.s} ${.ALLSRC:M*.S}"; \
  	if [ "$$files" != " " ]; then \
! 	  mkdep -a ${MKDEP} ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} $$files; \
  	fi
  	files="${.ALLSRC:M*.c}"; \
  	if [ "$$files" != "" ]; then \
! 	  mkdep -a ${MKDEP} ${CPPFLAGS} ${CFLAGS:M-[ID]*} $$files; \
  	fi
  	files="${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cxx}"; \
  	if [ "$$files" != "  " ]; then \
! 	  mkdep -a ${MKDEP} -+ ${CPPFLAGS} ${CXXFLAGS:M-[ID]*} $$files; \
  	fi
  .else
  .depend: