From f3dc285322d67289770bdc38427a3b48895a335e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 14:58:15 -0500 Subject: Adding another level of .in for the pc files. --- configure.ac | 4 ++-- libindicator/Makefile.am | 7 +++++-- libindicator/indicator.pc.in | 17 ----------------- libindicator/indicator.pc.in.in | 17 +++++++++++++++++ libindicator/indicator3.pc.in | 17 ----------------- libindicator/indicator3.pc.in.in | 17 +++++++++++++++++ 6 files changed, 41 insertions(+), 38 deletions(-) delete mode 100644 libindicator/indicator.pc.in create mode 100644 libindicator/indicator.pc.in.in delete mode 100644 libindicator/indicator3.pc.in create mode 100644 libindicator/indicator3.pc.in.in diff --git a/configure.ac b/configure.ac index c35802e..535807b 100644 --- a/configure.ac +++ b/configure.ac @@ -125,8 +125,8 @@ AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") AC_CONFIG_FILES([ Makefile libindicator/Makefile -libindicator/indicator.pc -libindicator/indicator3.pc +libindicator/indicator.pc.in +libindicator/indicator3.pc.in tests/Makefile tools/Makefile ]) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index d63f841..bb60d5c 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -10,8 +10,11 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator3.pc.in \ - indicator.pc.in + indicator3.pc.in.in \ + indicator.pc.in.in + +%.pc: %.pc.in + cp $< $@ include $(top_srcdir)/Makefile.am.marshal diff --git a/libindicator/indicator.pc.in b/libindicator/indicator.pc.in deleted file mode 100644 index 4e9b177..0000000 --- a/libindicator/indicator.pc.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -bindir=@bindir@ -includedir=@includedir@ - -indicatordir=${libdir}/indicators/5/ -iconsdir=@datarootdir@/@PACKAGE@/icons/ - -Cflags: -I${includedir}/libindicator-0.3 -Requires: gtk+-2.0 -Libs: -lindicator - -Name: libindicator -Description: libindicator. -Version: @VERSION@ - diff --git a/libindicator/indicator.pc.in.in b/libindicator/indicator.pc.in.in new file mode 100644 index 0000000..4e9b177 --- /dev/null +++ b/libindicator/indicator.pc.in.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators/5/ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-0.3 +Requires: gtk+-2.0 +Libs: -lindicator + +Name: libindicator +Description: libindicator. +Version: @VERSION@ + diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3.pc.in deleted file mode 100644 index 9fa0eac..0000000 --- a/libindicator/indicator3.pc.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -bindir=@bindir@ -includedir=@includedir@ - -indicatordir=${libdir}/indicators3/2/ -iconsdir=@datarootdir@/@PACKAGE@/icons/ - -Cflags: -I${includedir}/libindicator-0.3 -Requires: gtk+-3.0 -Libs: -lindicator3 - -Name: libindicator3 -Description: libindicator3. -Version: @VERSION@ - diff --git a/libindicator/indicator3.pc.in.in b/libindicator/indicator3.pc.in.in new file mode 100644 index 0000000..9fa0eac --- /dev/null +++ b/libindicator/indicator3.pc.in.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators3/2/ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-0.3 +Requires: gtk+-3.0 +Libs: -lindicator3 + +Name: libindicator3 +Description: libindicator3. +Version: @VERSION@ + -- cgit v1.2.3