Changeset 250 in MondoRescue for trunk/mondo

Timestamp:

Dec 20, 2005, 7:38:11 PM (18 years ago)

Author:

bcornec

Message:

merge -r243:249 $SVN_M/branches/2.05

Location:

trunk/mondo

Files:

• configure.in (modified) (1 diff)
• mondo.spec (modified) (3 diffs)
• mondo/Makefile.am (modified) (1 diff)
• mondo/post-nuke.sample/Makefile.am (copied) (copied from branches/2.05/mondo/mondo/post-nuke.sample/Makefile.am )
• mondo/post-nuke.sample/usr/Makefile.am (copied) (copied from branches/2.05/mondo/mondo/post-nuke.sample/usr/Makefile.am )
• mondo/post-nuke.sample/usr/bin/Makefile.am (copied) (copied from branches/2.05/mondo/mondo/post-nuke.sample/usr/bin/Makefile.am )

trunk/mondo/configure.in

@@ -126 +126 @@
 AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr getline asprintf trunc vasprintf])
 
-AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/docs/Makefile mondo/docs/en/Makefile mondo/docs/en/1.6x-howto/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile])
+AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/docs/Makefile mondo/docs/en/Makefile mondo/docs/en/1.6x-howto/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/xmondo/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile])

trunk/mondo/mondo.spec

@@ -11 +11 @@
 %define version VVV
 %define mrel    1
+%define src     %{name}-%{version}.tgz
 
 %if %is_redhat
-%define src     %{name}-%{version}.tgz
 Group:          Applications/Archiving
 Autoreq:        0
@@ -31 +31 @@
 
 %if %is_suse
-%define src     %{name}-%{version}.tgz
 Group:          Archiving/Backup
 %endif
@@ -101 +100 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 %makeinstall
+%if %is_suse
+%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/doc/%name-%{version}
+%endif
 
 %post

trunk/mondo/mondo/Makefile.am

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