From b938b01c9b850e2e68aa9eb3fe24b4f7c5f8b531 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Sat, 11 Feb 2012 10:34:18 +0100 Subject: [PATCH] Initialize $libdir before using it. --- debian/patches/multiarch.patch | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch index a41a341..69f34db 100644 --- a/debian/patches/multiarch.patch +++ b/debian/patches/multiarch.patch @@ -4,8 +4,8 @@ Description: Process configure's --libdir option to set the shared library Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3486615&group_id=84101&atid=571738 --- Makefile | 1 + - configure | 6 ++---- - 2 files changed, 3 insertions(+), 4 deletions(-) + configure | 8 +++----- + 2 files changed, 4 insertions(+), 5 deletions(-) --- gpac.orig/configure +++ gpac/configure @@ -36,6 +36,22 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3486615&group_id=841 ;; "Power Macintosh"|ppc) cpu="powerpc" +@@ -2066,6 +2064,7 @@ echo "# Automatically generated by confi + echo "GPAC_CONFIGURATION=$GPAC_CONFIGURATION" >> config.mak + + echo "prefix=$prefix" >> config.mak ++echo "libdir=$libdir" >> config.mak + echo "DESTDIR=$DESTDIR" >> config.mak + echo "moddir=$prefix/$libdir/gpac" >> config.mak + echo "moddir_path=$prefix/$libdir/gpac" >> config.mak +@@ -2082,7 +2081,6 @@ echo "OPTFLAGS=$CFLAGS" >> config.mak + echo "CPPFLAGS=$CPPFLAGS" >> config.mak + echo "LDFLAGS=$LDFLAGS" >> config.mak + echo "SHFLAGS=$SHFLAGS" >> config.mak +-echo "libdir=$libdir" >> config.mak + + + #for cross-compilation --- gpac.orig/Makefile +++ gpac/Makefile @@ -55,6 +55,7 @@ tar: -- 2.30.2