Changeset 250 for trunk/mondo


Ignore:
Timestamp:
Dec 20, 2005, 7:38:11 PM (13 years ago)
Author:
bcornec
Message:

merge -r243:249 $SVN_M/branches/2.05

Location:
trunk/mondo
Files:
3 edited
3 copied

Legend:

Unmodified
Added
Removed
  • trunk/mondo/configure.in

    r238 r250  
    126126AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr getline asprintf trunc vasprintf])
    127127
    128 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])
     128AC_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

    r244 r250  
    1111%define version VVV
    1212%define mrel    1
     13%define src     %{name}-%{version}.tgz
    1314
    1415%if %is_redhat
    15 %define src     %{name}-%{version}.tgz
    1616Group:          Applications/Archiving
    1717Autoreq:        0
     
    3131
    3232%if %is_suse
    33 %define src     %{name}-%{version}.tgz
    3433Group:          Archiving/Backup
    3534%endif
     
    101100%{__rm} -rf $RPM_BUILD_ROOT
    102101%makeinstall
     102%if %is_suse
     103%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/doc/%name-%{version}
     104%endif
    103105
    104106%post
  • trunk/mondo/mondo/Makefile.am

    r181 r250  
    1 SUBDIRS        = common mondoarchive mondorestore docs restore-scripts
     1SUBDIRS        = common mondoarchive mondorestore docs restore-scripts post-nuke.sample
     2DIST_SUBDIRS   = common mondoarchive mondorestore xmondo docs restore-scripts post-nuke.sample
    23
    34pkglib_DATA   = do-not-compress-these
    4 
    5 install-data-hook: post-nuke.sample
    6     cp -R post-nuke.sample $(pkglibdir)/
Note: See TracChangeset for help on using the changeset viewer.