summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-01-27 19:35:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-01-27 19:35:31 +0000
commit4df4016db20a8c395255a5de24ba2ee3d2a8b9a2 (patch)
treed3f3f39f57cc1d4c3cde4a044272b14424416cd4
parent43d400a7092d46d491c3e9cca3f640b82ce57fa9 (diff)
downloaddrakx-backup-do-not-use-4df4016db20a8c395255a5de24ba2ee3d2a8b9a2.tar
drakx-backup-do-not-use-4df4016db20a8c395255a5de24ba2ee3d2a8b9a2.tar.gz
drakx-backup-do-not-use-4df4016db20a8c395255a5de24ba2ee3d2a8b9a2.tar.bz2
drakx-backup-do-not-use-4df4016db20a8c395255a5de24ba2ee3d2a8b9a2.tar.xz
drakx-backup-do-not-use-4df4016db20a8c395255a5de24ba2ee3d2a8b9a2.zip
- adapt to new diskdrake modules
- some cleanup in drakxtools build
-rw-r--r--perl-install/Makefile4
-rw-r--r--perl-install/Makefile.drakxtools9
-rw-r--r--perl-install/install_interactive.pm4
-rw-r--r--perl-install/standalone.pm2
4 files changed, 11 insertions, 8 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 2dbd3dcfd..2a1039fab 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -24,8 +24,8 @@ tar-drakxtools: clean
cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/rpcinfo-flushed.c 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 ; perl -pi -e 's/^all: help/all:/' share/po/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 network interactive_http rpcinfo-flushed.c *.pm)
+ cd ../drakxtools ; rm -rf install* pkgs.pm help.pm ftp.pm http.pm crypto.pm t.pm */CVS ; mv Makefile.drakxtools Makefile
+ cd .. ; tar cfj drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config Newt diskdrake c ddcprobe serial_probe share/po sbus_probing resize_fat share/diskdrake.rc share/wizard.rc $(STANDALONEPMS) standalone/icons pixmaps network standalone/interactive_http rpcinfo-flushed.c *.pm)
cd .. ; rm -rf drakxtools
$(DIRS):
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 03d0eac1f..d639d4960 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -1,7 +1,8 @@
+# -*- Makefile -*-
include Makefile.config
INLIBDEST_DIRS = Newt c resize_fat sbus_probing
-HAVEINST_DIRS = share/po interactive_http
+HAVEINST_DIRS = share/po standalone/interactive_http
DIRS = $(INLIBDEST_DIRS) $(HAVEINST_DIRS) ddcprobe serial_probe
NAME = libDrakX
PREFIX =
@@ -21,7 +22,6 @@ all: rpcinfo-flushed $(DIRS)
$(DIRS):
install -d auto
- rm standalone ; ln -s . standalone
rm -f share/po/DrakX.pot # force rebuild of po's
[ ! -e $@/Makefile ] || $(MAKE) -C $@
@@ -48,6 +48,9 @@ install:
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
+
find $(LIBDEST) -name "*.pm" | xargs perl -pi -e '$$_ = "\n" if /\s*use\s+(diagnostics|vars|strict)/'
for i in $(HAVEINST_DIRS); do \
@@ -55,4 +58,4 @@ install:
done
find auto -follow -name .exists -o -name "*.bs" | xargs rm -f
- cp -rfL auto icons $(LIBDEST)
+ cp -rfL auto standalone/icons $(LIBDEST)
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index 70cdb4ec9..72665c341 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -31,10 +31,10 @@ sub partition_with_diskdrake {
$o->set_help('partition_with_diskdrake');
do {
$ok = 1;
- require diskdrake_interactive;
+ require diskdrake::interactive;
{
local $::expert = $::expert;
- diskdrake_interactive::main($o, $all_hds, $nowizard);
+ diskdrake::interactive::main($o, $all_hds, $nowizard);
}
if (delete $o->{wizard}) {
partitionWizard($o, 'nodiskdrake') or redo;
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index a9eeb9af0..1abd6aff8 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -63,7 +63,7 @@ sub explanations { c::syslog(c::LOG_INFO()|c::LOG_LOCAL1(), "@_") }
@common_functs = qw(renamef linkf symlinkf output substInFile mkdir_p rm_rf cp_af touch setVarsInSh setVarsInCsh update_gnomekderc);
@builtin_functs = qw(chmod chown unlink link symlink rename system);
-@drakx_modules = qw(Xconfig Xconfigurator Xconfigurator_consts any bootloader bootlook c class_discard commands crypto detect_devices devices diskdrake diskdrake_interactive fs fsedit http keyboard lang log loopback lvm modparm modules mouse my_gtk network partition_table partition_table_bsd partition_table_dos partition_table_empty partition_table_gpt partition_table_mac partition_table_raw partition_table_sun printer printerdrake proxy raid run_program scanner services steps swap timezone tinyfirewall);
+@drakx_modules = qw(Xconfig Xconfigurator Xconfigurator_consts any bootloader bootlook c class_discard commands crypto detect_devices devices diskdrake fs fsedit http keyboard lang log loopback lvm modparm modules mouse my_gtk network partition_table partition_table_bsd partition_table_dos partition_table_empty partition_table_gpt partition_table_mac partition_table_raw partition_table_sun printer printerdrake proxy raid run_program scanner services steps swap timezone tinyfirewall);
sub import {