Changeset 342


Ignore:
Timestamp:
Jan 20, 2006, 1:29:40 AM (13 years ago)
Author:
bcornec
Message:

merge -r339:341 $SVN_M/branches/stable

Location:
trunk/mondo
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/configure.in

    r340 r342  
    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/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])
     128AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/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/Makefile.am

    r250 r342  
    1 SUBDIRS        = common mondoarchive mondorestore docs restore-scripts post-nuke.sample
    2 DIST_SUBDIRS   = common mondoarchive mondorestore xmondo docs restore-scripts post-nuke.sample
     1SUBDIRS        = common mondoarchive mondorestore restore-scripts post-nuke.sample
     2DIST_SUBDIRS   = common mondoarchive mondorestore restore-scripts post-nuke.sample
    33
    44pkglib_DATA   = do-not-compress-these
Note: See TracChangeset for help on using the changeset viewer.