diff options
| -rw-r--r-- | Makefile.inc1 | 18 | ||||
| -rw-r--r-- | ObsoleteFiles.inc | 4 | ||||
| -rw-r--r-- | share/man/man7/build.7 | 14 |
3 files changed, 15 insertions, 21 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c040678..2da87a6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1071,9 +1071,6 @@ RM_I=-v .endif delete-old-files: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} - @echo "You have to run this in a native environment!" && false -.endif @echo ">>> Removing old files (only deletes safe to delete libs)" .for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. @@ -1087,18 +1084,12 @@ delete-old-files: @echo ">>> Old files removed" check-old-files: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} - @echo "You have to run this in a native environment!" && false -.endif @echo ">>> Checking for old files" .for file in ${OLD_FILES} @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" .endfor delete-old-libs: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} - @echo "You have to run this in a native environment!" && false -.endif @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt .for file in ${OLD_LIBS} @@ -1111,18 +1102,12 @@ delete-old-libs: @echo ">>> Old libraries removed" check-old-libs: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} - @echo "You have to run this in a native environment!" && false -.endif @echo ">>> Checking for old libraries" .for file in ${OLD_LIBS} @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" .endfor delete-old-dirs: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} - @echo "You have to run this in a native environment!" && false -.endif @echo ">>> Removing old directories" .for dir in ${OLD_DIRS} # Don't fail if an old directory isn't empty. @@ -1131,9 +1116,6 @@ delete-old-dirs: @echo ">>> Old directories removed" check-old-dirs: -.if ${TARGET_ARCH} != ${MACHINE_ARCH} - @echo "You have to run this in a native environment!" && false -.endif @echo ">>> Checking for old directories" .for dir in ${OLD_DIRS} @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 588673b..f1af4c8 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -223,7 +223,7 @@ OLD_FILES+=usr/share/man/man1/sasc.1.gz OLD_FILES+=usr/share/man/man1/sgsc.1.gz OLD_FILES+=usr/share/man/man4/i386/stl.4.gz OLD_FILES+=usr/share/man/man8/raidctl.8.gz -.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" +.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64" # 20040130: libkse renamed to libpthread OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse.so @@ -636,7 +636,7 @@ OLD_LIBS+=usr/lib/libpcap.so.2 OLD_LIBS+=usr/lib/libisc.so.1 # 200408XX OLD_LIBS+=usr/lib/snmp_netgraph.so.1 -.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" +.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64" # 20040130: libkse renamed to libpthread OLD_LIBS+=usr/lib/libkse.so.1 .endif diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 541d9ae..d018f1c 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 23, 2005 +.Dd August 3, 2005 .Dt BUILD 7 .Os .Sh NAME @@ -102,11 +102,23 @@ followed by Delete obsolete base system files and directories interactively. When -DBATCH_DELETE_OLD_FILES is specified at the command line, the delete operation will be non-interactive. +The variables +.Va DESTDIR , TARGET_ARCH +and +.Va TARGET +should be set as with +.Dq Li "make installworld" . .It Cm delete-old-libs Delete obsolete base system libraries interactively. This should only be used if no 3rd party software uses the libraries anymore. When -DBATCH_DELETE_OLD_FILES is specified at the command line, the delete operation will be non-interactive. +The variables +.Va DESTDIR , TARGET_ARCH +and +.Va TARGET +should be set as with +.Dq Li "make installworld" . .El .Pp For more information about the ports build process, see |
