[BACK]Return to Makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/Makefile between version 1.81 and 1.84

version 1.81, 1999/01/28 15:36:48 version 1.84, 1999/02/11 14:49:49
Line 30  SUBDIR+= gnu
Line 30  SUBDIR+= gnu
 # This is needed for libstdc++ and gen-params.  # This is needed for libstdc++ and gen-params.
 includes-gnu: includes-include includes-sys  includes-gnu: includes-include includes-sys
   
 # This little mess makes the includes and install targets  # Descend into the domestic tree if it exists AND
 # do the expected thing.  #  1) the target is clean, cleandir, or obj, OR
   #  2) the the target is install or includes AND NOT
   #    a) compiling only "exportable" code OR
   #    b) doing it as part of build.
   
 .if exists(domestic) && \  .if exists(domestic) && \
     (make(clean) || make(cleandir) || make(obj) || \      (make(clean) || make(cleandir) || make(obj) || \
     (!defined(_BUILD) && (make(includes) || make(install))))      ((make(includes) || make(install)) && \
       !(defined(EXPORTABLE_SYSTEM) || defined(_BUILD))))
 SUBDIR+= domestic  SUBDIR+= domestic
 .endif  .endif
   
Line 67  afterinstall:
Line 72  afterinstall:
 whatis.db:  whatis.db:
         (cd ${.CURDIR}/share/man && ${MAKE} makedb)          (cd ${.CURDIR}/share/man && ${MAKE} makedb)
   
   # wrt info/dir below:  It's safe to move this over top of /usr/share/info/dir,
   # as the build will automatically remove/replace the non-pkg entries there.
   
 build: beforeinstall  build: beforeinstall
 .if !defined(NOSHARE)  .if !defined(NOSHARE)
         (cd ${.CURDIR}/share/mk && ${MAKE} install)          (cd ${.CURDIR}/share/mk && ${MAKE} install)
         (cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)          (cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
           if [ -f ${DESTDIR}/usr/pkg/info/dir ]; then \
                   ${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} \
                           ${DESTDIR}/usr/pkg/info/dir ${DESTDIR}/usr/share/info/dir; \
                   rm -f ${DESTDIR}/usr/pkg/info/dir; \
                   ln -s /usr/share/info/dir ${DESTDIR}/usr/pkg/info/dir; \
           fi
 .endif  .endif
 .if !defined(UPDATE)  .if !defined(UPDATE)
         ${MAKE} cleandir          ${MAKE} cleandir
Line 78  build: beforeinstall
Line 92  build: beforeinstall
 .if empty(HAVE_GCC28)  .if empty(HAVE_GCC28)
 .if defined(DESTDIR)  .if defined(DESTDIR)
         @echo "*** CAPUTE!"          @echo "*** CAPUTE!"
         @echo "    You attempted to compile the world with egcs.  You must"          @echo "    You attempted to compile the world without egcs.  You must"
         @echo "    first install a native egcs compiler."          @echo "    first install a native egcs compiler."
         false          @false
 .else  .else
         (cd ${.CURDIR}/gnu/usr.bin/egcs && \          (cd ${.CURDIR}/gnu/usr.bin/egcs && \
             ${MAKE} depend && ${MAKE} ${_J} NOMAN= && \              ${MAKE} depend && ${MAKE} ${_J} NOMAN= && \
Line 94  build: beforeinstall
Line 108  build: beforeinstall
             ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)              ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
         (cd ${.CURDIR}/gnu/lib && \          (cd ${.CURDIR}/gnu/lib && \
             ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)              ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
   .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
           (cd ${.CURDIR}/domestic/lib && \
               ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
   .endif
         ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install          ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install
 .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)  .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
         (cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build)          (cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build)
Legend:
Removed from v.1.81  
changed lines
  Added in v.1.84
CVSweb <webmaster@jp.NetBSD.org>