eded54bd9
Eric Andersen
1999-11-12
Subject
Adjust install a bit...
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
Makefile +5 -5applets/install.sh +17 -0busybox.spec +1 -9examples/busybox.spec +1 -9install.sh +17 -0
Makefile+5 -5
| @@ -48,10 +48,9 @@ else | |
| endif | |
| - | ifndef $(prefix) |
| - | prefix=`pwd` |
| + | ifndef $(PREFIX) |
| + | PREFIX=`pwd`/busybox_install |
| endif | |
| - | BINDIR=$(prefix) |
| LIBRARIES= | |
| OBJECTS=$(shell ./busybox.sh) | |
| @@ -69,6 +68,7 @@ busybox.links: | |
| clean: | |
| - rm -f $(PROG) busybox.links *~ *.o core | |
| + | - rm -rf busybox_install |
| distclean: clean | |
| - rm -f $(PROG) | |
| @@ -77,8 +77,8 @@ force: | |
| $(OBJECTS): busybox.def.h internal.h Makefile | |
| - | install: $(PROG) |
| - | install.sh $(BINDIR) |
| + | install: busybox |
| + | install.sh $(PREFIX) |
| whichversion: | |
| @echo $(VERSION) | |
applets/install.sh+17 -0
| @@ -0,0 +1,17 @@ | |
| + | #!/bin/sh |
| + | |
| + | if [ "$1" == "" ]; then |
| + | echo "No installation directory. aborting." |
| + | exit 1; |
| + | fi |
| + | |
| + | h=`cat busybox.links` |
| + | |
| + | mkdir -p $1/bin |
| + | for i in $h ; do |
| + | mkdir -p $1/`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' ` |
| + | (cd $1/bin ; ln -s busybox `echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' ` ) |
| + | done |
| + | rm -f $1/bin/busybox |
| + | install -m 755 busybox $1/bin/busybox |
| + | |
busybox.spec+1 -9
| @@ -25,15 +25,7 @@ make | |
| %Install | |
| rm -rf $RPM_BUILD_ROOT | |
| - | mkdir -p $RPM_BUILD_ROOT/bin |
| - | h=`cat busybox.links` |
| - | |
| - | for i in $h ; do |
| - | mkdir -p $RPM_BUILD_ROOT/`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' ` |
| - | (cd $RPM_BUILD_ROOT/bin ; ln -s busybox `echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' ` ); |
| - | done |
| - | rm -f $RPM_BUILD_ROOT/bin/busybox |
| - | install -m 755 busybox $RPM_BUILD_ROOT/bin/busybox |
| + | make PREFIX=$RPM_BUILD_ROOT install |
| %Clean | |
| rm -rf $RPM_BUILD_ROOT | |
examples/busybox.spec+1 -9
| @@ -25,15 +25,7 @@ make | |
| %Install | |
| rm -rf $RPM_BUILD_ROOT | |
| - | mkdir -p $RPM_BUILD_ROOT/bin |
| - | h=`cat busybox.links` |
| - | |
| - | for i in $h ; do |
| - | mkdir -p $RPM_BUILD_ROOT/`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' ` |
| - | (cd $RPM_BUILD_ROOT/bin ; ln -s busybox `echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' ` ); |
| - | done |
| - | rm -f $RPM_BUILD_ROOT/bin/busybox |
| - | install -m 755 busybox $RPM_BUILD_ROOT/bin/busybox |
| + | make PREFIX=$RPM_BUILD_ROOT install |
| %Clean | |
| rm -rf $RPM_BUILD_ROOT | |
install.sh+17 -0
| @@ -0,0 +1,17 @@ | |
| + | #!/bin/sh |
| + | |
| + | if [ "$1" == "" ]; then |
| + | echo "No installation directory. aborting." |
| + | exit 1; |
| + | fi |
| + | |
| + | h=`cat busybox.links` |
| + | |
| + | mkdir -p $1/bin |
| + | for i in $h ; do |
| + | mkdir -p $1/`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' ` |
| + | (cd $1/bin ; ln -s busybox `echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' ` ) |
| + | done |
| + | rm -f $1/bin/busybox |
| + | install -m 755 busybox $1/bin/busybox |
| + | |