summaryrefslogtreecommitdiff
path: root/libxsettings-client/make_pkgconfig_x11.patch
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /libxsettings-client/make_pkgconfig_x11.patch
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'libxsettings-client/make_pkgconfig_x11.patch')
-rw-r--r--libxsettings-client/make_pkgconfig_x11.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/libxsettings-client/make_pkgconfig_x11.patch b/libxsettings-client/make_pkgconfig_x11.patch
index e69de29bb2..3a386672d2 100644
--- a/libxsettings-client/make_pkgconfig_x11.patch
+++ b/libxsettings-client/make_pkgconfig_x11.patch
@@ -0,0 +1,21 @@
+--- libxsettings-client0-0.12/Makefile.old 2004-04-20 16:48:18.000000000 +1000
++++ libxsettings-client0-0.12/Makefile 2004-04-20 16:58:07.000000000 +1000
+@@ -20,6 +20,9 @@
+ CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+ CPPFLAGS += -I../libxsettings
+
++CFLAGS += `pkg-config --cflags x11`
++LDFLAGS += `pkg-config --ldflags x11`
++
+ XSETTINGS_OBJS = $(patsubst %,%.os,$(XSETTINGS_MEMBERS))
+ DEPS = $(patsubst %,%.d,$(MEMBERS) $(XSETTINGS_MEMBERS))
+ SOURCES = $(patsubst %,%.c,$(MEMBERS) $(XSETTINGS_MEMBERS))
+@@ -39,7 +42,7 @@
+ ln -sf $^ $@
+
+ $(LIBXSETTINGS_SO): $(XSETTINGS_OBJS)
+- $(CC) -o $@ $^ -shared -Wl,-soname -Wl,$(LIBXSETTINGS_SO) -nostartfiles -L/usr/X11R6/lib -lX11 -L../libxsettings -lXsettings
++ $(CC) -o $@ $^ -shared -Wl,-soname -Wl,$(LIBXSETTINGS_SO) -nostartfiles $(LDFLAGS) -L../libxsettings -lXsettings
+
+ install-program: $(LIBXSETTINGS_SO)
+ install -d $(DESTDIR)$(PREFIX)/lib