Changeset 179 in MondoRescue for branches/2.05/mondo

Timestamp:

Dec 12, 2005, 7:50:21 PM (20 years ago)

Author:

bcornec

Message:

New locations for mondo and mindi:

for distros for file base install

---

/usr/sbin/mindi /usr/local/sbin/mindi
/usr/sbin/analyze-my-lvm /usr/local/sbin/analyze-my-lvm
/usr/sbin/mondoarchive /usr/local/sbin/mondoarchive
/usr/sbin/mondorestore /usr/local/sbin/mondorestore
/etc/m?nd? /usr/local/etc/m?nd?
/usr/share/doc/m?nd?* /usr/local/share/doc/m?nd?*
/usr/share/man/man8/m?nd?*.8 /usr/local/share/man/man8/m?nd?*.8
/usr/lib/m?nd? /usr/local/lib/m?nd?

(mondo needs to be finished - untested yet)

Location:

branches/2.05/mondo

Files:

• configure.in (modified) (1 diff)
• mondo.spec (modified) (2 diffs)
• mondo/Makefile.am (modified) (1 diff)
• mondo/mondorestore/mondo-restore.c (modified) (1 diff)
• mondo/restore-scripts/Makefile.am (modified) (1 diff)
• mondo/restore-scripts/mondo/Makefile.am (modified) (1 diff)
• mondo/restore-scripts/usr.bin/Makefile.am (modified) (1 diff)
• mondo/restore-scripts/usr/bin/Makefile.am (modified) (1 diff)
• mondo/xmondo/Makefile.am (modified) (1 diff)

branches/2.05/mondo/configure.in ¶

@@ -1 @@
-dnl Autoconfigure file for Mondo Rescue v2.0x_berlios
+dnl Autoconfigure file for Mondo Rescue v2.0x
 dnl Mondo by Hugo Rabson
 dnl This script by Joshua Oreman

branches/2.05/mondo/mondo.spec ¶

@@ -124 +124 @@
 
 %attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_datadir}/%{name}/restore-scripts/%{name}
-%{_datadir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/restore-scripts/%{name}
+%{_libdir}/%{name}
 %{_mandir}/*
 %{_libdir}/*
@@ -139 +139 @@
 - ia64 is now working
 - -p option related bug fixed
+- use libdir instead of datadir
 
 * Tue Sep 06 2005 Bruno Cornec <bcornec@users.berlios.de> 2.04_berlios

branches/2.05/mondo/mondo/Makefile.am ¶

@@ -4 +4 @@
 DIST_SUBDIRS   = common mondoarchive mondorestore xmondo docs restore-scripts
 
-pkgdata_DATA   = do-not-compress-these autorun
+pkglib_DATA   = do-not-compress-these autorun
 
 install-data-hook: post-nuke.sample
-    cp -R post-nuke.sample $(pkgdatadir)/
+    cp -R post-nuke.sample $(pkglibdir)/

branches/2.05/mondo/mondo/mondorestore/mondo-restore.c ¶

@@ -3371 +3371 @@
         toggle_node_selection(filelist, FALSE);
         toggle_all_root_dirs_on(filelist);
+        // BERLIOS: /usr/lib ???
         toggle_path_selection(filelist, "/usr/share", TRUE);
 //      show_filelist(filelist);

branches/2.05/mondo/mondo/restore-scripts/Makefile.am ¶

@@ -1 +1 @@
 SUBDIRS = mondo usr
 
-restoreetcdir       = $(pkgdatadir)/restore-scripts/etc
+restoreetcdir       = $(pkglibdir)/restore-scripts/etc
 restoreetc_DATA     = etc/multipath.conf.sample etc/raid0.conf.sample \
                       etc/raid1.conf.sample etc/raid4.conf.sample \

branches/2.05/mondo/mondo/restore-scripts/mondo/Makefile.am ¶

@@ -1 @@
-restoremondodir      = $(pkgdatadir)/restore-scripts/mondo
+restoremondodir      = $(pkglibdir)/restore-scripts/mondo
 restoremondo_SCRIPTS = ISO ask-me-a-question compare-me compare-subroutine-me \
                        edit-mountlist grub-MR hack-fstab hack-grub hack-lilo hack-elilo \

branches/2.05/mondo/mondo/restore-scripts/usr.bin/Makefile.am ¶

@@ -1 @@
-restoreusrbindir      = $(pkgdatadir)/restore-scripts/usr/bin
+restoreusrbindir      = $(pkglibdir)/restore-scripts/usr/bin
 #restoreusrbin_SCRIPTS = # petris pico nano

branches/2.05/mondo/mondo/restore-scripts/usr/bin/Makefile.am ¶

@@ -1 @@
-restoreusrbindir      = $(pkgdatadir)/restore-scripts/usr/bin
+restoreusrbindir      = $(pkglibdir)/restore-scripts/usr/bin
 #restoreusrbin_SCRIPTS = petris nano

branches/2.05/mondo/mondo/xmondo/Makefile.am ¶

@@ -7 +7 @@
 xmondo_LDADD    = ../common/libXmondo.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -L/usr/local/lib -L/usr/X11R6/lib
 xmondo_LDFLAGS  = $(all_libraries) @my_qt_libraries@ @my_kde_libraries@ $(KDE_RPATH)
-pkgdata_DATA    = mondo.png
+pkglib_DATA    = mondo.png
 
 xmondobackup.moc.cpp: xmondobackup.h