blob: 52448cac0eb7c63a6b00f1d8d36afacfb63377bb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
diff -ru a/configure b/configure
--- a/configure 2018-01-20 00:27:18.000000000 +0000
+++ b/configure 2019-08-19 14:51:02.694029707 +0000
@@ -6317,7 +6317,7 @@
fi
cf_cv_rm_so_locs=yes
;;
- (linux*|gnu*|k*bsd*-gnu)
+ (linux*|gnu*|k*bsd*-gnu|midipix*)
if test "$DFT_LWR_MODEL" = "shared" ; then
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
diff -ru a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
--- a/misc/gen-pkgconfig.in 2018-01-01 22:51:23.000000000 +0000
+++ b/misc/gen-pkgconfig.in 2019-08-19 14:51:02.694029707 +0000
@@ -64,17 +64,7 @@
MENU_LIBRARY="${MENU_NAME}@USE_ARG_SUFFIX@"
FORM_LIBRARY="${FORM_NAME}@USE_ARG_SUFFIX@"
-CFLAGS="@PKG_CFLAGS@"
-if test "$includedir" != "/usr/include" ; then
- includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
- test "$includetop" = "/usr/include" && includetop="$includedir"
- if test "x$includetop" != "x$includedir"
- then
- CFLAGS="$CFLAGS -I${includetop}"
- fi
- CFLAGS="$CFLAGS -I\${includedir}"
-fi
-
+CFLAGS='-I${includedir}'
LDFLAGS=
if test "$libdir" != "/usr/lib" ; then
LDFLAGS="$LDFLAGS -L\${libdir}"
diff -ru a/misc/Makefile.in b/misc/Makefile.in
--- a/misc/Makefile.in 2017-12-31 20:34:42.000000000 +0000
+++ b/misc/Makefile.in 2019-08-19 14:51:50.598061950 +0000
@@ -113,12 +113,12 @@
# pkg-config is not installed. Work around that by creating the library
# directory during this rule:
@MAKE_PC_FILES@install.libs :: pc-files
-@MAKE_PC_FILES@ @$(SHELL) -c 'case "x$(DESTDIR)$(PKG_CONFIG_LIBDIR)" in \
+@MAKE_PC_FILES@ @$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \
@MAKE_PC_FILES@ (x/*) \
-@MAKE_PC_FILES@ mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
+@MAKE_PC_FILES@ mkdir -p $(PKG_CONFIG_LIBDIR); \
@MAKE_PC_FILES@ for name in *.pc; do \
@MAKE_PC_FILES@ echo installing $$name; \
-@MAKE_PC_FILES@ $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
+@MAKE_PC_FILES@ $(INSTALL_DATA) $$name $(PKG_CONFIG_LIBDIR)/$$name; \
@MAKE_PC_FILES@ done \
@MAKE_PC_FILES@ ;; \
@MAKE_PC_FILES@ (*) \
|
