diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
commit | 2dd6d1fc82c0563c0b3af90ad4926fa6463c204f (patch) | |
tree | cea2d78836b0958b0402b42976c4c84ec6e700a8 /package/libpri/patches/patch-Makefile | |
parent | c82f34b5a8e2851c2074c1e03263f788eb2c28be (diff) | |
parent | 3cda7c5f211225fea03a3634daeef9cafd627aa2 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/firefox/Makefile
package/jpeg/patches/patch-ltmain_sh
Diffstat (limited to 'package/libpri/patches/patch-Makefile')
-rw-r--r-- | package/libpri/patches/patch-Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/package/libpri/patches/patch-Makefile b/package/libpri/patches/patch-Makefile index 743924088..811ef59a9 100644 --- a/package/libpri/patches/patch-Makefile +++ b/package/libpri/patches/patch-Makefile @@ -1,5 +1,5 @@ --- libpri-1.4.10.2.orig/Makefile 2008-08-06 20:20:51.000000000 +0200 -+++ libpri-1.4.10.2/Makefile 2011-01-21 14:32:08.278658337 +0100 ++++ libpri-1.4.10.2/Makefile 2011-04-01 14:39:42.851818751 +0200 @@ -31,8 +31,8 @@ CC=gcc GREP=grep AWK=awk @@ -30,11 +30,13 @@ %.lo: %.c $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< -@@ -146,7 +147,6 @@ $(STATIC_LIBRARY): $(STATIC_OBJS) +@@ -145,8 +146,7 @@ $(STATIC_LIBRARY): $(STATIC_OBJS) + ranlib $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) - $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) +- $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) - $(LDCONFIG) $(LDCONFIG_FLAGS) . ++ $(CC) -shared $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS) ln -sf libpri.so.$(SONAME) libpri.so version.c: FORCE |