summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-10 16:39:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-10 16:39:32 +0000
commiteb33adf7f7e934e4d6938d5939d9a223810aa07c (patch)
tree1314abf00acc2b7bc2f043463c6a21e353a13437
parent1a649e4bd1f0a76ec28fcb851b2f8fe2d6d967e1 (diff)
downloaddrakx-eb33adf7f7e934e4d6938d5939d9a223810aa07c.tar
drakx-eb33adf7f7e934e4d6938d5939d9a223810aa07c.tar.gz
drakx-eb33adf7f7e934e4d6938d5939d9a223810aa07c.tar.bz2
drakx-eb33adf7f7e934e4d6938d5939d9a223810aa07c.tar.xz
drakx-eb33adf7f7e934e4d6938d5939d9a223810aa07c.zip
nicer use of vendor_perl instead of site_perl (check of rpmtools.pm and
packdrake.pm presence) ... i had forgot to commit :-(
-rw-r--r--tools/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/Makefile b/tools/Makefile
index bdfab48c8..ea9ceb50a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -13,13 +13,13 @@ $(DIRS):
make -C $@
install:
- install -d $(ROOTDEST)/misc/auto
- install make_mdkinst_stage2 $(ROOTDEST)/misc
- 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:version`; cd /usr/lib/perl5/vendor_perl/$$version/*-linux ; install packdrake.pm rpmtools.pm $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; }
- eval `perl -V:version`; cd /usr/lib/perl5/vendor_perl/$$version/*-linux/auto ; cp -rf rpmtools $(ROOTDEST)/misc/auto || { echo "install rpmtools first!" ; exit 1; }
- mkdir -p $(DEST)/usr/bin
+ @install -d $(ROOTDEST)/misc/auto
+ @install make_mdkinst_stage2 $(ROOTDEST)/misc
+ @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:installvendorarch`; cd $$installvendorarch ; install packdrake.pm rpmtools.pm $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; }
+ @eval `perl -V:installvendorarch`; cd $$installvendorarch/auto ; cp -rf rpmtools $(ROOTDEST)/misc/auto || { echo "install rpmtools first!" ; exit 1; }
+ @mkdir -p $(DEST)/usr/bin
xhost+: %: %.c
$(CC) $(CFLAGS) $< -L/usr/X11R6/lib -lX11 -o $@