diff options
| author | jstebbins <[email protected]> | 2009-08-24 17:32:22 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-08-24 17:32:22 +0000 |
| commit | 2752e26db58d8304e3ddb03a9b95c4f9af7bf5fa (patch) | |
| tree | 20bcb6484190356bc65bd0448cd4ca3f7f36ba80 /contrib/libdvdread | |
| parent | 9e43a26a870845acafbeff92f62db3609c48e37c (diff) | |
build system: some changes that simplify things for packaging tools
- Add DESTDIR to install path for HandBrakeCLI
- Modify linux packaging rules for deb and rpm packages to use DESTDIR
- lingui: only update icon cache during install if DESTDIR is not set
- patch out the hardcoded install path for m4 macros in libdvdread and libdvdnav
when uid==0
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2774 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/libdvdread')
| -rw-r--r-- | contrib/libdvdread/A03-m4-uid0.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/contrib/libdvdread/A03-m4-uid0.patch b/contrib/libdvdread/A03-m4-uid0.patch new file mode 100644 index 000000000..eab26177c --- /dev/null +++ b/contrib/libdvdread/A03-m4-uid0.patch @@ -0,0 +1,28 @@ +diff -Naur libdvdread.orig/configure.ac libdvdread/configure.ac +--- libdvdread.orig/configure.ac 2009-01-08 14:57:10.000000000 -0800 ++++ libdvdread/configure.ac 2009-08-24 10:17:47.036747814 -0700 +@@ -167,24 +167,6 @@ + + AC_SUBST(DEBUG_CFLAGS) + +-dnl --------------------------------------------- +-dnl Get where .m4 should be installed. +-dnl --------------------------------------------- +-case "`id`" in +- uid=0\(* ) +- AC_MSG_CHECKING(for aclocal directory) +- if (aclocal --version) < /dev/null > /dev/null 2>&1; then +- ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`" +- AC_MSG_RESULT($ACLOCAL_DIR) +- else +- ACLOCAL_DIR="/usr/local/share/aclocal" +- AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR) +- fi +- escapedprefix="`echo $prefix | sed -e 's/\\//\\\\\//g'`" +- ACLOCAL_DIR="`echo $ACLOCAL_DIR|sed -e 's/^'$escapedprefix/'\${prefix}'/`" +- AC_SUBST(ACLOCAL_DIR) +- ;; +-esac + AM_CONDITIONAL(INSTALL_M4, test x"$ACLOCAL_DIR" != "x") + + dnl --------------------------------------------- |