diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-26 02:51:07 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-26 02:51:07 +0000 |
| commit | 128d70150bc0c5188503f90d4d97311d7ba40cee (patch) | |
| tree | ec01837c6c36c84715c853aefea4d2b213d12da1 /tools/Makefile | |
| parent | 9c29b12f0d1ea1a7d88d41d24c72a85cbc1b8862 (diff) | |
| download | drakx-backup-do-not-use-128d70150bc0c5188503f90d4d97311d7ba40cee.tar drakx-backup-do-not-use-128d70150bc0c5188503f90d4d97311d7ba40cee.tar.gz drakx-backup-do-not-use-128d70150bc0c5188503f90d4d97311d7ba40cee.tar.bz2 drakx-backup-do-not-use-128d70150bc0c5188503f90d4d97311d7ba40cee.tar.xz drakx-backup-do-not-use-128d70150bc0c5188503f90d4d97311d7ba40cee.zip | |
adapt to new directories layout:
- Mandrake/mdkinst -> install/stage2/live
- Mandrake/base/mdkinst_stage2.bz2 -> install/stage2/mdkinst_stage2.bz2
- Mandrake/base/rpmsrate -> media/media_info/rpmsrate
- Mandrake/RPMS -> media/main
- images -> install/images
- isolinux -> install/isolinux
- Mandrake/share/advertising -> install/extra/advertising
Diffstat (limited to 'tools/Makefile')
| -rw-r--r-- | tools/Makefile | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/tools/Makefile b/tools/Makefile index cafff8e29..d9c2b283a 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,8 +1,7 @@ -ROOTDEST = /export -DEST = $(ROOTDEST)/Mandrake/mdkinst -RPMS = $(wildcard $(ROOTDEST)/Mandrake/RPMS/*.rpm) +include ../Makefile.config + +RPMS = $(wildcard $(MAIN_RPMS_DIR)/*.rpm) DIRS = ddcprobe serial_probe -BASE = $(ROOTDEST)/Mandrake/base CFLAGS = -Wall ARCH := $(shell arch | egrep "(x86_64|sparc64|s390x)") @@ -20,14 +19,14 @@ $(DIRS): make -C $@ install: - @install -d $(ROOTDEST)/misc/auto - @install make_mdkinst_stage2 $(ROOTDEST)/misc - @cp -rf `perl -Mpackdrake -le 'print $$INC{"packdrake.pm"}'` $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; } - @cp -rf `perl -MURPM -le 'print $$INC{"URPM.pm"}' | sed s/URPM.pm//`URPM* $(ROOTDEST)/misc || { echo "install perl-URPM first!" ; exit 1; } - @cp -rf `perl -MURPM -le 'print $$INC{"URPM.pm"}' | sed s/URPM.pm//`auto/URPM $(ROOTDEST)/misc/auto || { echo "install perl-URPM first!" ; exit 1; } - @cd /usr/bin ; install packdrake $(ROOTDEST)/misc || { echo "packdrake is missing"; exit 1; } - @cd /usr/bin ; install gendistrib rpm2header $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; } - @mkdir -p $(DEST)/usr/bin + @install -d $(MISC_DEST)/auto + @install make_mdkinst_stage2 $(MISC_DEST) + cp -rf `perl -Mpackdrake -le 'print $$INC{"packdrake.pm"}'` $(MISC_DEST) || { echo "install rpmtools first!" ; exit 1; } + @cp -rf `perl -MURPM -le 'print $$INC{"URPM.pm"}' | sed s/URPM.pm//`URPM* $(MISC_DEST) || { echo "install perl-URPM first!" ; exit 1; } + @cp -rf `perl -MURPM -le 'print $$INC{"URPM.pm"}' | sed s/URPM.pm//`auto/URPM $(MISC_DEST)/auto || { echo "install perl-URPM first!" ; exit 1; } + @cd /usr/bin ; install packdrake $(MISC_DEST) || { echo "packdrake is missing"; exit 1; } + @cd /usr/bin ; install gendistrib rpm2header $(MISC_DEST) || { echo "install rpmtools first!" ; exit 1; } + @mkdir -p $(STAGE2_LIVE)/usr/bin xhost+: %: %.c $(CC) $(CFLAGS) $< -L/usr/X11R6/$(LIB_NAME) -lX11 -o $@ |