diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-04-10 23:55:52 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-04-10 23:55:52 +0000 |
| commit | 685fae40c9f86e5865a36fcd545f21d3a33cc14e (patch) | |
| tree | 8d31de6b20667fcb1f6628cc7b5833e8d2b4138a | |
| parent | bd51e8aef5bce79c649f875f597b457355f5c928 (diff) | |
| download | drakx-backup-do-not-use-685fae40c9f86e5865a36fcd545f21d3a33cc14e.tar drakx-backup-do-not-use-685fae40c9f86e5865a36fcd545f21d3a33cc14e.tar.gz drakx-backup-do-not-use-685fae40c9f86e5865a36fcd545f21d3a33cc14e.tar.bz2 drakx-backup-do-not-use-685fae40c9f86e5865a36fcd545f21d3a33cc14e.tar.xz drakx-backup-do-not-use-685fae40c9f86e5865a36fcd545f21d3a33cc14e.zip | |
- fix wiz_*.png removing
- fix copying cardmgr* which included cardmgr.o
| -rw-r--r-- | perl-install/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index a7f1d7339..36089e44e 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -17,7 +17,7 @@ tar-drakxtools: clean cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe tools/serial_probe drakxtools cd ../drakxtools ; perl -pi -e 's/^C_RPM.*/C_RPM=0/; s/^C_DRAKX.*/C_DRAKX=0/' c/Makefile cd ../drakxtools ; rm -rf install* pkgs.pm ftp.pm t.pm */CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* . - cd .. ; tar cfj drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config Newt c ddcprobe serial_probe share/po sbus_probing resize_fat share/diskdrake.rc share/wizard.rc $(STANDALONEPMS) icons pixmaps *.pm) --exclude pixmaps/wiz_*.png + cd .. ; tar cfj drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config Newt c ddcprobe serial_probe share/po sbus_probing resize_fat share/diskdrake.rc share/wizard.rc $(STANDALONEPMS) icons pixmaps *.pm) cd .. ; rm -rf drakxtools $(DIRS): @@ -89,7 +89,7 @@ ifeq (sparc,$(ARCH)) ln -s /usr/X11R6/lib/X11/xkb/xkbcomp $(DEST)/usr/bin/xkbcomp endif ifeq (i386,$(ARCH)) - install -s ../all.kernels/*/cardmgr/cardmgr* $(DEST)/usr/bin + install -s ../all.kernels/*/cardmgr/cardmgr{,-*} $(DEST)/usr/bin endif for i in `cat /tmp/list`; do \ @@ -129,7 +129,7 @@ endif cd share ; cp -a consolefonts $(DEST)/usr/share cd share ; cp template.in/*.in $(DEST)/usr/share -cd share ; cp -f *.png *.xpm $(DEST)/usr/share - -cd pixmaps ; cp -f *.png *.xpm $(DEST)/usr/share + -cd pixmaps ; cp -f *.png *.xpm $(DEST)/usr/share ; rm -f $(DEST)/usr/share/wiz_* cd share ; cp -a themes $(DEST)/usr/share/gtk cd share ; cp compssUsers compssUsers.desktop rpmsrate $(ROOTDEST)/Mandrake/base |