devhelp r1070 - in trunk: . data

[rhult svn gnome org]

Author: rhult
Date: Wed Oct  1 20:11:37 2008
New Revision: 1070
URL: http://svn.gnome.org/viewvc/devhelp?rev=1070&view=rev

Log:
2008-10-01  Richard Hult  <richard imendio com>

	* configure.in:
	* Makefile.am:
	* data/Makefile.am: Move pc file to data/.


Added:
   trunk/data/libdevhelp-1.0.pc.in
      - copied unchanged from r1066, /trunk/libdevhelp-1.0.pc.in
Removed:
   trunk/libdevhelp-1.0.pc.in
Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/data/   (props changed)
   trunk/data/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Oct  1 20:11:37 2008
@@ -1,8 +1,5 @@
 SUBDIRS = po src data misc contrib
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libdevhelp-1.0.pc
-
 INTLTOOL =                      \
 	intltool-extract.in     \
 	intltool-merge.in       \
@@ -11,7 +8,6 @@
 EXTRA_DIST =			\
 	$(INTLTOOL)             \
 	autogen.sh		\
-	libdevhelp-1.0.pc.in    \
 	misc/devhelp.el	        \
 	misc/html2funcs.py	\
 	misc/html2xml.py	\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Oct  1 20:11:37 2008
@@ -87,10 +87,10 @@
 
 AC_CONFIG_FILES([
 Makefile
-libdevhelp-1.0.pc
 po/Makefile.in
 src/Makefile
 data/Makefile
+data/libdevhelp-1.0.pc
 data/devhelp.desktop.in
 data/icons/Makefile
 data/ui/Makefile

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Oct  1 20:11:37 2008
@@ -1,5 +1,8 @@
 SUBDIRS = ui dtd icons
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libdevhelp-1.0.pc
+
 @INTLTOOL_DESKTOP_RULE@
 
 DESKTOP_IN_FILES = devhelp.desktop.in
@@ -14,6 +17,7 @@
 @INTLTOOL_SCHEMAS_RULE@
 
 EXTRA_DIST =			\
+	libdevhelp-1.0.pc.in    \
 	$(DESKTOP_IN_FILES)	\
 	$(DESKTOP_FILES)        \
 	$(schemas_in_files)     \