summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-12-02 14:12:09 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-12-02 14:12:09 +0000
commitd062b0681ed8e6658593064edd42aaeb23664414 (patch)
treee14bac642a45f0407df4bf8b942f4c4c995b3ef6
parent8212f09c04859180c0e67588f0ab5912b3c08a86 (diff)
downloaddrakx-backup-do-not-use-d062b0681ed8e6658593064edd42aaeb23664414.tar
drakx-backup-do-not-use-d062b0681ed8e6658593064edd42aaeb23664414.tar.gz
drakx-backup-do-not-use-d062b0681ed8e6658593064edd42aaeb23664414.tar.bz2
drakx-backup-do-not-use-d062b0681ed8e6658593064edd42aaeb23664414.tar.xz
drakx-backup-do-not-use-d062b0681ed8e6658593064edd42aaeb23664414.zip
no_comment
-rw-r--r--perl-install/Makefile6
-rw-r--r--perl-install/Makefile.drakxtools4
-rw-r--r--perl-install/share/compssList2
-rw-r--r--tools/Makefile2
4 files changed, 6 insertions, 8 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 93734f614..89c54cfd1 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -10,7 +10,7 @@ STAGE2 = $(ROOTDEST)/Mandrake/base/mdkinst_stage2
BASE = $(ROOTDEST)/Mandrake/base
DESTREP4PMS = $(DEST)$(REP4PMS)
PERL = perl
-LOCALFILES = ../tools/ddcprobe/ddcxinfos ../tools/e2fsck.shared pnp_serial
+LOCALFILES = $(patsubst %, ../tools/%,e2fsck.shared ddcprobe/ddcxinfos pnp_serial/pnp_serial)
LOCALFILES2 = extract_archive
DIRS = c Newt po pci_probing resize_fat
EXCLUDE = $(LOCALFILES) boot.img keymaps consolefonts install
@@ -31,9 +31,9 @@ clean:
tar-drakxtools: clean
$(MAKE) -C ../tools clean
- cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe drakxtools
+ cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe tools/pnp_serial drakxtools
cd ../drakxtools ; rm -rf install* ForMakefile.pm pkgs.pm ftp.pm t.pm standalone/CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* .
- cd .. ; tar cfy drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile MonitorsDB Newt c ddcprobe po pci_probing resize_fat diskdrake diskdrake.rc XFdrake mousedrake lspcidrake printerdrake keyboarddrake *.pm)
+ cd .. ; tar cfy drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile MonitorsDB Newt c ddcprobe pnp_serial po pci_probing resize_fat diskdrake diskdrake.rc XFdrake mousedrake lspcidrake printerdrake keyboarddrake *.pm)
cd .. ; rm -rf drakxtools
$(DIRS):
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index f53577618..8fb4218b3 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -1,4 +1,4 @@
-DIRS = ddcprobe po Newt c pci_probing resize_fat
+DIRS = ddcprobe pnp_serial po Newt c pci_probing resize_fat
PREFIX =
SBINDEST = $(PREFIX)/usr/sbin
ETCDEST = $(PREFIX)/etc/gtk
@@ -17,7 +17,7 @@ $(DIRS):
install:
install -d $(BINDEST) $(ETCDEST) $(SBINDEST) $(LIBDEST) $(X11DEST) $(DIRS:%=$(LIBDEST)/%)
install diskdrake XFdrake mousedrake lspcidrake printerdrake keyboarddrake $(SBINDEST)
- install -s ddcprobe/ddcxinfos $(SBINDEST)
+ install -s ddcprobe/ddcxinfos pnp_serial/pnp_serial $(SBINDEST)
for i in *.pm ; do perl -pe '$$_ = "\n" if /\s*use\s+(diagnostics|vars|strict)/' $$i > $(LIBDEST)/$$i ; done
install -m 644 MonitorsDB $(X11DEST)
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index a32746ca2..96a67ba0d 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -89,7 +89,7 @@ e2fsprogs-devel 1 0 25
ed 45 0 5
ee 66 0 54
efax 34 99 30
-eject 72 83 59
+eject 92 83 91
ElectricFence 1 0 96
elm 15 0 13
emacs 30 0 0
diff --git a/tools/Makefile b/tools/Makefile
index c8da121e6..a33c481d3 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,7 +1,6 @@
ROOTDEST = /export
DEST = $(ROOTDEST)/Mandrake/mdkinst
RPMS = $(wildcard $(ROOTDEST)/Mandrake/RPMS/*.rpm)
-LOCALFILES = ddcprobe/ddcxinfos
BASE = $(ROOTDEST)/Mandrake/base
.PHONY: clean install
@@ -11,7 +10,6 @@ all: $(BASE)/depslist $(BASE)/hdlist install
install:
$(MAKE) gendepslist rpm2header ddcprobe/ddcxinfos
install make_mdkinst_stage2 gendepslist rpm2header genhdlist $(ROOTDEST)/misc
- install -s $(LOCALFILES) $(DEST)/usr/bin
gendepslist: %: %.cc
$(CXX) -I/usr/include/rpm $(CFLAGS) $< -lrpm -ldb1 -lz -o $@