mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
31 lines
977 B
Diff
31 lines
977 B
Diff
--- glib-1.2.10/glib-config.in.multilib 2007-01-11 10:00:48.000000000 -0500
|
|
+++ glib-1.2.10/glib-config.in 2007-01-11 10:13:25.000000000 -0500
|
|
@@ -1,7 +1,10 @@
|
|
#!/bin/sh
|
|
|
|
-prefix=@prefix@
|
|
-exec_prefix=@exec_prefix@
|
|
+[ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
|
|
+prefix=`${PKG_CONFIG} --variable prefix glib`
|
|
+exec_prefix=`${PKG_CONFIG} --variable exec_prefix glib`
|
|
+libdir=`${PKG_CONFIG} --variable libdir glib`
|
|
+includedir=`${PKG_CONFIG} --variable includedir glib`
|
|
exec_prefix_set=no
|
|
|
|
usage()
|
|
@@ -88,7 +91,7 @@
|
|
if test "$lib_gthread" = "yes"; then
|
|
cflags="$cflags @G_THREAD_CFLAGS@"
|
|
fi
|
|
- echo -I@includedir@/glib-1.2 -I@libdir@/glib/include $includes $cflags
|
|
+ echo -I${includedir}/glib-1.2 -I${libdir}/glib/include $includes $cflags
|
|
fi
|
|
if test "$echo_libs" = "yes"; then
|
|
libsp=""
|
|
@@ -104,5 +107,5 @@
|
|
libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp"
|
|
libsa="$libsa @G_MODULE_LIBS@"
|
|
fi
|
|
- echo -L@libdir@ $libsp $libsa
|
|
+ echo -L${libdir} $libsp $libsa
|
|
fi
|