[arch-commits] Commit in logrotate/repos (testing-x86_64 testing-x86_64/PKGBUILD)

[Aaron Griffin]

    Date: Tuesday, November 4, 2008 @ 00:36:55
  Author: aaron
Revision: 18332

Merged revisions 18329,18331 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/logrotate/trunk

........
  r18329 | aaron | 2008-11-03 21:31:04 -0800 (Mon, 03 Nov 2008) | 2 lines
  
  upgpkg: logrotate 3.7.7-2
      Fix FHS man pages
........
  r18331 | aaron | 2008-11-03 21:36:34 -0800 (Mon, 03 Nov 2008) | 1 line
  
  upgpkg: logrotate 3.7.7-3
........

Modified:
  logrotate/repos/testing-x86_64/	(properties)
  logrotate/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)


Property changes on: logrotate/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /logrotate/trunk:1-15673
   + /logrotate/trunk:1-18331

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-11-04 05:36:34 UTC (rev 18331)
+++ testing-x86_64/PKGBUILD	2008-11-04 05:36:55 UTC (rev 18332)
@@ -4,7 +4,7 @@
 
 pkgname=logrotate
 pkgver=3.7.7
-pkgrel=1
+pkgrel=3
 pkgdesc="Rotates system logs automatically"
 url='http://cvs.fedora.redhat.com'
 arch=(i686 x86_64)
@@ -25,9 +25,12 @@
 
   sed -i 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\
     config.h
-  sed -i "s|CFLAGS = -Wall|CFLAGS = -Wall $CFLAGS" Makefile
+  sed -i "s|CFLAGS = -Wall|CFLAGS = -Wall $CFLAGS|" Makefile
   make || return 1
-  make PREFIX=$startdir/pkg install
-  install -D -m644 ../logrotate.conf $startdir/pkg/etc/logrotate.conf
-  install -D -m744 ../logrotate.cron.daily $startdir/pkg/etc/cron.daily/logrotate
+  make PREFIX=$pkgdir install
+  install -D -m644 ../logrotate.conf $pkgdir/etc/logrotate.conf
+  install -D -m744 ../logrotate.cron.daily $pkgdir/etc/cron.daily/logrotate
+
+  mkdir -p $pkgdir/usr/share/
+  mv $pkgdir/usr/man $pkgdir/usr/share
 }