summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-09 03:29:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-09 03:29:37 +0000
commit7e2907ae1c1c48c619f37371b73a3fe3002153f5 (patch)
tree35cc370a72b69cef8d12893b99cf7ff4b41668fc
parent73c48458b20eb5ea3b46ccbd9f5d231a6a32a5a0 (diff)
downloaddrakx-7e2907ae1c1c48c619f37371b73a3fe3002153f5.tar
drakx-7e2907ae1c1c48c619f37371b73a3fe3002153f5.tar.gz
drakx-7e2907ae1c1c48c619f37371b73a3fe3002153f5.tar.bz2
drakx-7e2907ae1c1c48c619f37371b73a3fe3002153f5.tar.xz
drakx-7e2907ae1c1c48c619f37371b73a3fe3002153f5.zip
ask perl where to find package.pm and URPM.pm, this is more versatile than using installvendorlib
-rw-r--r--tools/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 38507bab1..cafff8e29 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -22,11 +22,11 @@ $(DIRS):
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; }
- @eval `perl -V:installvendorlib`; cd $$installvendorlib ; cp -rf packdrake.pm $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; }
- @eval `perl -V:installvendorarch`; cd $$installvendorarch ; cp -rf URPM* $(ROOTDEST)/misc || { echo "install perl-URPM first!" ; exit 1; }
- @eval `perl -V:installvendorarch`; cd $$installvendorarch/auto ; cp -rf URPM $(ROOTDEST)/misc/auto || { echo "install perl-URPM first!" ; exit 1; }
@mkdir -p $(DEST)/usr/bin
xhost+: %: %.c