Mercurial > pidgin3 / file diff

--- a/libpurple/Makefile.am	Wed Nov 12 00:31:53 2014 -0500
+++ b/libpurple/Makefile.am	Mon Nov 10 16:17:31 2014 -0500
@@ -9,10 +9,10 @@
 		purple-send-async \
 		purple-url-handler \
 		purple.h.in \
-		purple.pc.in \
-		purple-uninstalled.pc.in \
 		version.h.in \
 		Makefile.mingw \
+		data/purple.pc.in \
+		data/purple-uninstalled.pc.in \
 		win32/global.mak \
 		win32/libc_interface.c \
 		win32/libc_interface.h \
@@ -26,12 +26,9 @@
 		win32/win32dep.h
 
 if USE_GCONFTOOL
-GCONF_DIR=gconf
+GCONF_DIR=data/gconf
 endif
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = purple.pc
-
 SUBDIRS = $(GCONF_DIR) plugins protocols ciphers . tests example
 
 purple_coresources = \
@@ -297,6 +294,9 @@
 mediainclude_HEADERS = \
 	$(addprefix $(srcdir)/media/, $(purple_mediaheaders))
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = data/purple.pc
+
 libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)
 libpurple_la_LDFLAGS = -export-dynamic -version-info $(PURPLE_LT_VERSION_INFO) -no-undefined
 libpurple_la_LIBADD = \