Merge pull request #14 from rubund/master

Thomas Hirsch · Thomas Hirsch · commit 359ab944c97b · 2014-09-07T14:59:35.000+02:00
Deb-package configuration. Tbd: update version history
diff --git a/ChangeLog b/ChangeLog
@@ -0,0 +1,7 @@
+4.1.1:
+    Simplified building routines in Linux, Windows and Mac
+    ...
+    ...
+    Translated some documentation into English.
+4.1.0:
+    First release to be published under an open source license
diff --git a/Makefile.am b/Makefile.am
@@ -1,3 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src/GM src/UT src/FYBA doc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = fyba.pc
diff --git a/configure.ac b/configure.ac
@@ -33,4 +33,4 @@ AC_FUNC_STRTOD
 AC_CHECK_FUNCS([floor getcwd memmove memset mkdir modf pow rmdir sqrt strchr strerror strpbrk strstr strtol strtoul])
 
 AC_OUTPUT
-AC_OUTPUT(Makefile src/GM/Makefile src/UT/Makefile src/FYBA/Makefile doc/Makefile)
+AC_OUTPUT(fyba.pc Makefile src/GM/Makefile src/UT/Makefile src/FYBA/Makefile doc/Makefile)
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -1,3 +1,3 @@
 docdir = $(datadir)/doc/@PACKAGE@
-doc_DATA = en_EN/fyba.html en_EN/fyba1.html en_EN/fyba2.html no_NB/fyba.html no_NB/fyba1.html no_NB/fyba2.html
+doc_DATA = en_EN/fyba.html en_EN/fyba1.html en_EN/fyba2.html
 
diff --git a/fyba.pc.in b/fyba.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_NAME@
+Description: FYBA library to read and write norwegian geodata standard format SOSI 
+Version: @PACKAGE_VERSION@
+Requires:
+Libs: -L${libdir} -lfyba
+Cflags: -I${includedir}/fyba

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`docdir = $(datadir)/doc/@PACKAGE@`
`2`		`-doc_DATA = en_EN/fyba.html en_EN/fyba1.html en_EN/fyba2.html no_NB/fyba.html no_NB/fyba1.html no_NB/fyba2.html`
	`2`	`+doc_DATA = en_EN/fyba.html en_EN/fyba1.html en_EN/fyba2.html`
`3`	`3`