diff options
| -rw-r--r-- | perl-install/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/Makefile.drakxtools | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 9dc6dc2e8..f9355d626 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 help.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) + 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 network *.pm) cd .. ; rm -rf drakxtools $(DIRS): diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index dd3209f60..c11afdd58 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -11,6 +11,7 @@ ETCDEST = $(PREFIX)/etc/gtk BINX11DEST = $(PREFIX)/usr/X11R6/bin LIBX11DEST = $(PREFIX)/usr/X11R6/lib/X11 LIBDEST = $(LIBDIR)/$(NAME) +NETLIBDEST = $(LIBDIR)/$(NAME)/network PIXDIR = $(DATADIR)/$(NAME)/pixmaps .PHONY: $(DIRS) @@ -23,13 +24,14 @@ $(DIRS): $(MAKE) -C $@ install: - install -d $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR) $(LIBDEST) $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(DIRS:%=$(LIBDEST)/%) + install -d $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR) $(LIBDEST) $(NETLIBDEST) $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(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 install -m 644 *.pm $(LIBDEST) + install -m 644 network/*.pm $(NETLIBDEST) install -m 644 pixmaps/* $(PIXDIR) install -m 644 share/diskdrake.rc $(ETCDEST) install -m 644 share/wizard.rc $(ETCDEST) |