diff options
| author | damien <damien@mandriva.com> | 2001-02-26 17:16:57 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-02-26 17:16:57 +0000 |
| commit | 1b13ca3c15391735f57ddab3f508ffae79baafac (patch) | |
| tree | ad9bd1cd5c4dbd335fc322fe3b6dffadda412ec6 | |
| parent | 239ecf04bbce95baa43fc11091566c2cdedefeb3 (diff) | |
| download | drakx-1b13ca3c15391735f57ddab3f508ffae79baafac.tar drakx-1b13ca3c15391735f57ddab3f508ffae79baafac.tar.gz drakx-1b13ca3c15391735f57ddab3f508ffae79baafac.tar.bz2 drakx-1b13ca3c15391735f57ddab3f508ffae79baafac.tar.xz drakx-1b13ca3c15391735f57ddab3f508ffae79baafac.zip | |
new pixmap policy
| -rw-r--r-- | perl-install/Makefile | 4 | ||||
| -rw-r--r-- | perl-install/Makefile.drakxtools | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 3e6939035..cae105603 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -17,8 +17,8 @@ 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 *.pm) - cd .. ; rm -rf drakxtools + 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): install -d auto diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index 5686ba9b5..7c0396263 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -9,7 +9,7 @@ BINDEST = $(PREFIX)/usr/bin LIBDEST = $(PREFIX)/usr/lib/libDrakX BINX11DEST = $(PREFIX)/usr/X11R6/bin LIBX11DEST = $(PREFIX)/usr/X11R6/lib/X11 - +PIXDIR = $(PREFIX)/usr/share/libDrakX/pixmaps .PHONY: $(DIRS) all: $(DIRS) @@ -21,13 +21,14 @@ $(DIRS): $(MAKE) -C $@ install: - install -d $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR) $(LIBDEST) $(BINX11DEST) $(LIBX11DEST) $(LIBDEST)/po $(DIRS:%=$(LIBDEST)/%) + install -d $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR) $(LIBDEST) $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(LIBDEST)/po $(DIRS:%=$(LIBDEST)/%) install -d $(LIBDEST)/sbus_probing install $(STANDALONEPMS) $(SBINDEST) install -s ddcprobe/ddcxinfos serial_probe/serial_probe $(SBINDEST) ln -s ../../$(patsubst $(PREFIX)/usr%,%,$(SBINDEST))/XFdrake $(BINX11DEST)/Xdrakres for i in *.pm ; do perl -pe '$$_ = "\n" if /\s*use\s+(diagnostics|vars|strict)/' $$i > $(LIBDEST)/$$i ; done + install -m 644 pixmaps/* $(PIXDIR) install -m 644 share/diskdrake.rc $(ETCDEST) install -m 644 share/wizard.rc $(ETCDEST) install -m 644 share/po/*.po $(LIBDEST)/po |