From e8ce0626d99114a66ae48273bb1478a3454b65cf Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 3 Feb 2007 17:29:14 +0000 Subject: [PATCH] s/PREFIX/CONFIG_PREFIX/ --- INSTALL | 4 ++-- Makefile.help | 2 +- README | 8 ++++---- docs/busybox_header.pod | 10 +++++----- examples/bootfloppy/bootfloppy.txt | 2 +- examples/bootfloppy/mkrootfs.sh | 2 +- examples/busybox.spec | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/INSTALL b/INSTALL index 6644481a3..a7902ab8d 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,7 @@ The BusyBox build process is similar to the Linux kernel build: make menuconfig # This creates a file called ".config" make # This creates the "busybox" executable - make install # or make PREFIX=/path/from/root install + make install # or make CONFIG_PREFIX=/path/from/root install The full list of configuration and install options is available by typing: @@ -114,7 +114,7 @@ configuration step, as in: make O=/some/empty/directory allyesconfig cd /some/empty/directory make - make PREFIX=. install + make CONFIG_PREFIX=. install More Information: ================= diff --git a/Makefile.help b/Makefile.help index a1ff4fcb8..fc661b110 100644 --- a/Makefile.help +++ b/Makefile.help @@ -27,7 +27,7 @@ help: @echo ' make SED="$(objtree)/sed"' @echo @echo 'Installation:' - @echo ' install - install busybox into $(PREFIX)' + @echo ' install - install busybox into $(CONFIG_PREFIX)' @echo ' uninstall' @echo @echo 'Development:' diff --git a/README b/README index 0ed196a53..96ca0bb9d 100644 --- a/README +++ b/README @@ -50,10 +50,10 @@ Using busybox: The build automatically generates a file "busybox.links", which is used by 'make install' to create symlinks to the BusyBox binary for all compiled in - commands. This uses the PREFIX environment variable to specify where to - install, and installs hardlinks or symlinks depending on the configuration - preferences. (You can also manually run the install script at - "applets/install.sh"). + commands. This uses the CONFIG_PREFIX environment variable to specify + where to install, and installs hardlinks or symlinks depending + on the configuration preferences. (You can also manually run + the install script at "applets/install.sh"). ---------------- diff --git a/docs/busybox_header.pod b/docs/busybox_header.pod index ab1ebd501..804b83970 100644 --- a/docs/busybox_header.pod +++ b/docs/busybox_header.pod @@ -33,11 +33,11 @@ menuconfig' to select the functionality that you wish to enable. Then run After the compile has finished, you should use 'make install' to install BusyBox. This will install the 'bin/busybox' binary, in the target directory -specified by PREFIX. PREFIX can be set when configuring BusyBox, or you can -specify an alternative location at install time (i.e., with a command line -like 'make PREFIX=/tmp/foo install'). If you enabled any applet installation -scheme (either as symlinks or hardlinks), these will also be installed in -the location pointed to by PREFIX. +specified by CONFIG_PREFIX. CONFIG_PREFIX can be set when configuring BusyBox, +or you can specify an alternative location at install time (i.e., with a +command line like 'make CONFIG_PREFIX=/tmp/foo install'). If you enabled +any applet installation scheme (either as symlinks or hardlinks), these will +also be installed in the location pointed to by CONFIG_PREFIX. =head1 USAGE diff --git a/examples/bootfloppy/bootfloppy.txt b/examples/bootfloppy/bootfloppy.txt index b514e6305..6866b724f 100644 --- a/examples/bootfloppy/bootfloppy.txt +++ b/examples/bootfloppy/bootfloppy.txt @@ -72,7 +72,7 @@ The following steps will create a root file system. - Install the Busybox binary and accompanying symlinks: (chdir to busybox directory) - make PREFIX=(path to)loop/ install + make CONFIG_PREFIX=(path to)loop/ install - Make device files in /dev: diff --git a/examples/bootfloppy/mkrootfs.sh b/examples/bootfloppy/mkrootfs.sh index e79ed418e..5cdff21a0 100755 --- a/examples/bootfloppy/mkrootfs.sh +++ b/examples/bootfloppy/mkrootfs.sh @@ -76,7 +76,7 @@ cd $BASE_DIR cd $BUSYBOX_DIR make distclean make CC=$BASE_DIR/$UCLIBC_DIR/extra/gcc-uClibc/i386-uclibc-gcc -make PREFIX=$BASE_DIR/$TARGET_DIR install +make CONFIG_PREFIX=$BASE_DIR/$TARGET_DIR install cd $BASE_DIR diff --git a/examples/busybox.spec b/examples/busybox.spec index 3986436c1..494eed941 100644 --- a/examples/busybox.spec +++ b/examples/busybox.spec @@ -34,7 +34,7 @@ make %Install rm -rf $RPM_BUILD_ROOT -make PREFIX=$RPM_BUILD_ROOT install +make CONFIG_PREFIX=$RPM_BUILD_ROOT install %Clean rm -rf $RPM_BUILD_ROOT