[Glibc-bsd-commits] r5331 - in trunk/freebsd-buildutils/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-15 16:26:27 +0000 (Wed, 15 Jan 2014)
New Revision: 5331

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
Log:
Adjust LIBDATADIR, LIBEXECDIR and LINTLIBDIR for FHS conformance.

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2014-01-15 14:15:11 UTC (rev 5330)
+++ trunk/freebsd-buildutils/debian/changelog	2014-01-15 16:26:27 UTC (rev 5331)
@@ -1,3 +1,9 @@
+freebsd-buildutils (10.0-2) unstable; urgency=low
+
+  * Adjust LIBDATADIR, LIBEXECDIR and LINTLIBDIR for FHS conformance.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 15 Jan 2014 17:26:00 +0100
+
 freebsd-buildutils (10.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2014-01-15 14:15:11 UTC (rev 5330)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2014-01-15 16:26:27 UTC (rev 5331)
@@ -175,6 +175,19 @@
  BINMODE?=	555
  NOBINMODE?=	444
  
+@@ -147,9 +147,9 @@
+ LIBDIR?=	/usr/lib
+ LIBCOMPATDIR?=	/usr/lib/compat
+ LIBPRIVATEDIR?=	/usr/lib/private
+-LIBDATADIR?=	/usr/libdata
+-LIBEXECDIR?=	/usr/libexec
+-LINTLIBDIR?=	/usr/libdata/lint
++LIBDATADIR?=	/usr/share
++LIBEXECDIR?=	${LIBDIR}
++LINTLIBDIR?=	${LIBDATADIR}/lint
+ SHLIBDIR?=	${LIBDIR}
+ LIBOWN?=	${BINOWN}
+ LIBGRP?=	${BINGRP}
 @@ -162,7 +162,7 @@
  # Share files
  SHAREDIR?=	/usr/share