Changeset 250


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

merge -r243:249 $SVN_M/branches/2.05

Location:
trunk
Files:
5 edited
3 copied

Legend:

Unmodified
Added
Removed
  • trunk/mindi/install.sh

    r244 r250  
    3131echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
    3232
    33 if [ "_$DOCDIR" = "_" ]; then
    34     DOCDIR=$local/share/doc/mindi-$MINDIVER
    35 fi
     33DOCDIR=$local/share/doc/mindi-$MINDIVER
     34MANDIR=$local/share/man/man8
    3635
    3736echo "Creating target directories ..."
    38 install -m 755 -d $conf $local/lib/mindi $local/share/man/man8 $local/sbin $DOCDIR
     37install -m 755 -d $conf $local/lib/mindi $MANDIR $local/sbin $DOCDIR
    3938
    4039echo "Copying files ..."
     
    5554install -m 755 analyze-my-lvm parted2fdisk.pl $local/sbin
    5655
    57 install -m 644 mindi.8 $local/share/man/man8
     56install -m 644 mindi.8 $MANDIR
    5857install -m 644 CHANGES COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $DOCDIR
    5958
     
    104103if [ "$RPMBUILDMINDI" != "true" ]; then
    105104    chown -R root:root $local/lib/mindi $conf/mindi $conf $DOCDIR
    106     chown root:root $local/sbin/mindi $local/share/man/man8/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl
     105    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl
    107106    if [ "$ARCH" = "ia64" ] ; then
    108107        chown root:root $local/sbin/parted2fdisk
  • trunk/mindi/mindi.spec

    r244 r250  
    1111%define version VVV
    1212%define mrel    1
    13 %define docname     %{name}-%{version}
    1413%define src     %{name}-%{version}.tgz
    1514
     
    3332%if %is_suse
    3433Group:          Archiving/Backup
    35 %define docname     %{name}
    3634%endif
    3735
     
    7270export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
    7371export RPMBUILDMINDI="true"
    74 export DOCDIR=${RPM_BUILD_ROOT}${RPM_DOC_DIR}/%{docname}
    7572
    7673./install.sh
     74
     75%if %is_suse
     76%{__rm} -rf $RPM_BUILD_ROOT/%{_datadir}/doc/%name-%{version}
     77%endif
    7778
    7879%clean
  • 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.