diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Makefile.config | 2 | ||||
| -rw-r--r-- | perl-install/Makefile.drakxtools | 1 | ||||
| -rw-r--r-- | perl-install/drakxtools.spec | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 5ce063b74..9fa6980c6 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -5,7 +5,7 @@ TMPDIR = /tmp SO_FILES = c/blib/arch/auto/c/c.so PMS_DIRS = Newt Xconfig c xf86misc diskdrake harddrake interactive modules network partition_table printer resize_fat sbus_probing security fs PMS = *.pm $(PMS_DIRS:%=%/*.pm) commands install2 -STANDALONEPMS_ = XFdrake adduserdrake autosetupprintqueues diskdrake drakTermServ drakautoinst drakauth drakbackup drakboot drakbug drakbug_report drakclock drakconnect drakedm drakfirewall drakfloppy drakfont drakgw drakhelp drakids drakperm drakproxy drakpxe drakroam draksec draksound draksplash drakupdate_fstab drakups drakvpn drakxservices drakxtv fileshareset harddrake2 finish-install keyboarddrake listsupportedprinters localedrake logdrake lsnetdrake mousedrake net_applet net_monitor printerdrake scannerdrake service_harddrake service_harddrake_confirm bootloader-config +STANDALONEPMS_ = XFdrake adduserdrake autosetupprintqueues diskdrake drakTermServ drakautoinst drakauth drakbackup drakboot drakbug drakbug_report drakclock drakconnect drakedm drakfirewall drakfloppy drakfont drakgw drakhelp drakperm drakproxy drakpxe drakroam draksec draksound draksplash drakupdate_fstab drakups drakvpn drakxservices drakxtv fileshareset harddrake2 finish-install keyboarddrake listsupportedprinters localedrake logdrake lsnetdrake mousedrake net_applet net_monitor printerdrake scannerdrake service_harddrake service_harddrake_confirm bootloader-config STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%) ALLPMS = $(PMS) $(STANDALONEPMS) share/advertising/*.pl share/compssUsers.pl* diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index 68130e0dc..ec1383ba0 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -37,7 +37,6 @@ install: mv -f $(SBINDEST)/lsnetdrake $(BINDEST) mv -f $(SBINDEST)/drakbug $(BINDEST) mv -f $(SBINDEST)/drakhelp $(BINDEST) - mv -f $(SBINDEST)/drakids $(BINDEST) mv -f $(SBINDEST)/localedrake $(BINDEST) mv -f $(SBINDEST)/net_applet $(BINDEST) diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec index a096c32f9..59fd0e5e9 100644 --- a/perl-install/drakxtools.spec +++ b/perl-install/drakxtools.spec @@ -204,7 +204,7 @@ dirs1="usr/lib/libDrakX usr/share/libDrakX" (cd $RPM_BUILD_ROOT ; find $dirs1 usr/bin usr/sbin ! -type d -printf "/%%p\n")|egrep -v 'bin/.*harddrake' > %{name}.list (cd $RPM_BUILD_ROOT ; find $dirs1 -type d -printf "%%%%dir /%%p\n") >> %{name}.list -perl -ni -e '/activefw\.pm|clock|drak(backup|bug|clock|floppy|font|ids|log|net_monitor|perm|printer|sec|splash|TermServ)|gtk|icons|logdrake|net_applet|net_monitor|pixmaps|printer|xf86misc|\.png$/ ? print STDERR $_ : print' %{name}.list 2> %{name}-gtk.list +perl -ni -e '/activefw\.pm|clock|drak(backup|bug|clock|floppy|font|log|net_monitor|perm|printer|sec|splash|TermServ)|gtk|icons|logdrake|net_applet|net_monitor|pixmaps|printer|xf86misc|\.png$/ ? print STDERR $_ : print' %{name}.list 2> %{name}-gtk.list perl -ni -e '/http/ ? print STDERR $_ : print' %{name}.list 2> %{name}-http.list perl -ni -e 'm!lib/libDrakX|bootloader-config|fileshare|lsnetdrake|ddcxinfos|drakupdate_fstab|rpcinfo|serial_probe! && !/newt/i ? print STDERR $_ : print' %{name}.list 2> %{name}-backend.list |