[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] Generate pc-file in a standard way
From: |
Peter Lemenkov |
Subject: |
[PATCH 2/2] Generate pc-file in a standard way |
Date: |
Wed, 13 Feb 2019 14:18:07 +0300 |
Autotools can generate files based on templates. Let's use
it instead of running sed and friends.
Signed-off-by: Peter Lemenkov <address@hidden>
---
Makefile.am | 10 ----------
configure.ac | 2 +-
spread-sheet-widget.pc.in | 13 ++++++-------
3 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5a34e3a..15eaaca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,16 +73,6 @@ src/ssw-marshaller.h: src/marshall-list
glib-genmarshal --header --prefix=ssw_cclosure_marshal $< > $@,tmp
mv $@,tmp $@
-spread-sheet-widget.pc: spread-sheet-widget.pc.in configure.ac
- $(SED) -e 's|%version%|$(PACKAGE_VERSION)|' \
- -e 's|%prefix%|$(prefix)|' \
- -e 's|%glib_dependency%|'"$(glib_dependency)"'|' \
- -e 's|%gtk_dependency%|'"$(gtk_dependency)"'|' \
- $< > $@,tmp
- mv $@,tmp $@
-
-CLEANFILES = spread-sheet-widget.pc
-
install-exec-local: spread-sheet-widget.pc
$(MKDIR_P) $(DESTDIR)$(libdir)/pkgconfig
chmod -R u+w $(DESTDIR)$(libdir)
diff --git a/configure.ac b/configure.ac
index 71b16bd..5d83560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ glib_dependency="glib-2.0 >= 2.44"
PKG_CHECK_MODULES([GTK3], [$gtk_dependency])
PKG_CHECK_MODULES([GLIB2], [$glib_dependency])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile spread-sheet-widget.pc])
AC_SUBST([gtk_dependency])
AC_SUBST([glib_dependency])
diff --git a/spread-sheet-widget.pc.in b/spread-sheet-widget.pc.in
index 3f0ff7b..2ed3bb1 100644
--- a/spread-sheet-widget.pc.in
+++ b/spread-sheet-widget.pc.in
@@ -1,11 +1,10 @@
-prefix=%prefix%
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
address@hidden@
address@hidden@
address@hidden@
address@hidden@
-Name: spread-sheet-widget
+Name: @PACKAGE_NAME@
Description: A spreadsheet widget for Gtk+
-Version: %version%
-Requires: %glib_dependency% %gtk_dependency%
+Requires: @glib_dependency@ @gtk_dependency@
Libs: -L${libdir} -lspread-sheet-widget
Cflags: -I${includedir}
--
2.20.1