diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-24 22:12:28 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-24 22:12:28 +0000 |
| commit | efcd2b112baacf97b784f965a4188733969f2b67 (patch) | |
| tree | de190a319a22b61e9ad33c6aa9e57a699ec3af26 | |
| parent | f64471ee99e8b5d7ee21af0a51b5901fa597dbcf (diff) | |
| download | drakx-backup-do-not-use-efcd2b112baacf97b784f965a4188733969f2b67.tar drakx-backup-do-not-use-efcd2b112baacf97b784f965a4188733969f2b67.tar.gz drakx-backup-do-not-use-efcd2b112baacf97b784f965a4188733969f2b67.tar.bz2 drakx-backup-do-not-use-efcd2b112baacf97b784f965a4188733969f2b67.tar.xz drakx-backup-do-not-use-efcd2b112baacf97b784f965a4188733969f2b67.zip | |
add PMS_DIRS in Makefile.config and use it everywhere
(cleaning some ugly stuff in Makefile.drakxtools while doing so)
=> now adding a new directory only need to be done at one place
| -rw-r--r-- | perl-install/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/Makefile.config | 3 | ||||
| -rw-r--r-- | perl-install/Makefile.drakxtools | 12 |
3 files changed, 5 insertions, 12 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 0c464be57..64220572d 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -7,7 +7,7 @@ include Makefile.config POFILES = $(shell ls share/po/*.po) MOFILES = $(POFILES:%.po=%.mo) -DISTFILES = Makefile Makefile.config Newt apps.net_monitor diskdrake c ddcprobe drakxtools.spec pam.net_monitor serial_probe share/po sbus_probing resize_fat share/diskdrake.rc $(STANDALONEPMS) standalone/icons pixmaps network interactive partition_table standalone/interactive_http rpcinfo-flushed.c *.pm security harddrake +DISTFILES = *.pm $(PMS_DIRS) Makefile Makefile.config apps.net_monitor ddcprobe drakxtools.spec pam.net_monitor serial_probe share/po share/diskdrake.rc $(STANDALONEPMS) standalone/icons pixmaps standalone/interactive_http rpcinfo-flushed.c OTHERS = $(OTHERDIRS) $(OTHERFILES) OTHERDIRS = tools/ddcprobe tools/serial_probe OTHERFILES = tools/rpcinfo-flushed.c diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index dabc34066..696a4ce62 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -5,7 +5,8 @@ ARCH := $(patsubst sparc%,sparc,$(ARCH)) VERSION = 2.2.10-BOOT SUDO = sudo SO_FILES = c/blib/arch/auto/c/c.so -PMS = *.pm Newt/*.pm c/stuff.pm resize_fat/*.pm sbus_probing/*.pm network/*.pm interactive/*.pm partition_table/*.pm diskdrake/*.pm harddrake/*.pm commands install2 g_auto_install live_install live_install2 share/advertising/*.pl +PMS_DIRS = c diskdrake harddrake interactive network Newt partition_table resize_fat sbus_probing security +PMS = *.pm $(PMS_DIRS:%=%/*.pm) commands install2 g_auto_install live_install live_install2 share/advertising/*.pl STANDALONEPMS_ = diskdrake XFdrake mousedrake printerdrake logdrake keyboarddrake drakconnect drakbackup drakfont drakproxy localedrake net_monitor drakbug_report tinyfirewall drakxconf drakxservices draksec drakboot adduserdrake drakgw drakautoinst livedrake lsnetdrake scannerdrake fileshareset drakxtv drakfloppy harddrake2 drakTermServ service_harddrake service_harddrake.sh drakbug STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%) ALLPMS = $(PMS) $(STANDALONEPMS) diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index 6b6dadfc9..70c5e9210 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -26,7 +26,7 @@ $(DIRS): [ ! -e $@/Makefile ] || $(MAKE) -C $@ install: - mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{harddrake,pixmaps} $(LIBDEST)/{network,security,harddrake,interactive,partition_table} $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(INITDIR) + mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{harddrake,pixmaps} $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(INITDIR) install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%) install $(STANDALONEPMS) $(SBINDEST) install -s rpcinfo-flushed ddcprobe/ddcxinfos serial_probe/serial_probe $(SBINDEST) @@ -35,21 +35,13 @@ install: mv -f $(SBINDEST)/lsnetdrake $(BINDEST)/lsnetdrake install -m 644 *.pm $(LIBDEST) - for i in network harddrake security interactive partition_table; do install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done + for i in $(PMS_DIRS); do install -d $$i ; install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done install -m 644 pixmaps/* $(PIXDIR) install -m 644 share/diskdrake.rc $(DATADIR)/$(NAME) install -d $(PREFIX)/etc/security echo 'RESTRICT=yes' > $(PREFIX)/etc/security/fileshare.conf - install -m 644 $(patsubst %,Newt/%.pm,Newt) $(LIBDEST)/Newt - install -m 644 $(patsubst %,c/%.pm,stuff) $(LIBDEST)/c - install -m 644 $(patsubst %,sbus_probing/%.pm,main) $(LIBDEST)/sbus_probing - install -m 644 $(patsubst %,resize_fat/%.pm,main any boot_sector c_rewritten dir_entry directory fat info_sector io) $(LIBDEST)/resize_fat - - install -d $(LIBDEST)/diskdrake - install -m 644 diskdrake/*.pm $(LIBDEST)/diskdrake - for i in $(HAVEINST_DIRS); do \ $(MAKE) -C $$i install PREFIX=$(PREFIX) DATADIR=$(DATADIR) NAME=$(NAME) ; \ done |