aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-09-28 07:59:12 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-09-28 07:59:12 +0200
commitca990cf0a12a96b8761015f7ab68a03994168c96 (patch)
tree83dd08f75b717048b829913da785d4660b6a8590
parentf9653af3bab5e398310bffdc1c49053fd722dcc8 (diff)
parentf8772b6fc2b40a22f851e20badab975177f50176 (diff)
downloadnx-libs-ca990cf0a12a96b8761015f7ab68a03994168c96.tar.gz
nx-libs-ca990cf0a12a96b8761015f7ab68a03994168c96.tar.bz2
nx-libs-ca990cf0a12a96b8761015f7ab68a03994168c96.zip
Merge pull request #64 from uli42/pr/add_pkgconfig
Various fixes for pkgconfig file creation.
-rw-r--r--nxcomp/Makefile.in2
-rw-r--r--nxcompext/Makefile.in3
-rw-r--r--nxcompshad/Makefile.in3
3 files changed, 8 insertions, 0 deletions
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index b4d11e53b..d309c4949 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -60,6 +60,8 @@ LIBS = @LIBS@
srcdir = @srcdir@
prefix = @prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
exec_prefix = @exec_prefix@
bindir = @bindir@
man1dir = @mandir@/man1
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index a8a94353b..dd18c8053 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -52,6 +52,8 @@ LIBS = @LIBS@ -lz -lNX_X11 -lXcomp
srcdir = @srcdir@
prefix = @prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
exec_prefix = @exec_prefix@
bindir = @bindir@
man1dir = @mandir@/man1
@@ -167,6 +169,7 @@ install.bin:
install.lib: all
./mkinstalldirs $(DESTDIR)${libdir}
+ ./mkinstalldirs $(DESTDIR)${pkgconfigdir}
./mkinstalldirs $(DESTDIR)${includedir}/nx
./mkinstalldirs $(DESTDIR)${pkgconfigdir}
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 3b4dc0745..7614d55b9 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -70,6 +70,8 @@ LIBS = @LIBS@ -lNX_X11
srcdir = @srcdir@
prefix = @prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
exec_prefix = @exec_prefix@
bindir = @bindir@
man1dir = @mandir@/man1
@@ -201,6 +203,7 @@ install.bin:
install.lib: all
$(INSTALL_DIR) $(DESTDIR)${libdir}
+ $(INSTALL_DIR) $(DESTDIR)${pkgconfigdir}
$(INSTALL_DIR) $(DESTDIR)${includedir}/nx
$(INSTALL_DIR) $(DESTDIR)${pkgconfigdir}
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}