From 2aad031f3f5b3626f1b2361c9b3e2c85dcb1d5aa Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 25 Oct 2008 04:06:07 +0200 Subject: [PATCH] sysklogd: make required dirs in patch. --HG-- extra : convert_revision : 609d85d4b6911170ab36b7bf71e716ce2d0be05c --- templates/sysklogd-fix-install.diff | 16 ++++++++++------ templates/sysklogd.tmpl | 6 ------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/templates/sysklogd-fix-install.diff b/templates/sysklogd-fix-install.diff index c467124e202..2d70ee2e801 100644 --- a/templates/sysklogd-fix-install.diff +++ b/templates/sysklogd-fix-install.diff @@ -1,8 +1,5 @@ -Do not hardcode path to install, install into /sbin, do not hardcode -root user for installing manpages. - ---- Makefile.orig 2008-10-25 03:36:32.000000000 +0200 -+++ Makefile 2008-10-25 03:37:38.000000000 +0200 +--- Makefile.orig 2008-10-25 04:03:26.000000000 +0200 ++++ Makefile 2008-10-25 04:04:34.000000000 +0200 @@ -27,10 +27,10 @@ SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fo LDFLAGS= -s @@ -16,7 +13,12 @@ root user for installing manpages. MANDIR = $(prefix)/usr/share/man # There is one report that under an all ELF system there may be a need to -@@ -131,10 +131,10 @@ install_exec: syslogd klogd +@@ -127,14 +127,17 @@ clobber: clean + rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd + + install_exec: syslogd klogd ++ ${INSTALL} -d ${BINDIR} + ${INSTALL} -m 500 -s syslogd ${BINDIR}/syslogd ${INSTALL} -m 500 -s klogd ${BINDIR}/klogd install_man: @@ -24,6 +26,8 @@ root user for installing manpages. - ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslogd.8 ${MANDIR}/man8/syslogd.8 - ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} syslog.conf.5 ${MANDIR}/man5/syslog.conf.5 - ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} klogd.8 ${MANDIR}/man8/klogd.8 ++ ${INSTALL} -d ${MANDIR}/man5 ++ ${INSTALL} -d ${MANDIR}/man8 + ${INSTALL} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8 + ${INSTALL} -m ${MAN_PERMS} syslogd.8 ${MANDIR}/man8/syslogd.8 + ${INSTALL} -m ${MAN_PERMS} syslog.conf.5 ${MANDIR}/man5/syslog.conf.5 diff --git a/templates/sysklogd.tmpl b/templates/sysklogd.tmpl index 290338e9cd0..85e91a614fb 100644 --- a/templates/sysklogd.tmpl +++ b/templates/sysklogd.tmpl @@ -22,9 +22,3 @@ long_desc=" System.map file." run_depends="glibc-2.8" - -# Make directories before installing, as Makefile doesn't do this! -run_stuff_before_install_cmd=" -mkdir -p $XBPS_DESTDIR/$pkgname-$version/usr/share/man/man8 -mkdir -p $XBPS_DESTDIR/$pkgname-$version/usr/share/man/man5 -mkdir -p $XBPS_DESTDIR/$pkgname-$version/sbin"