From 6615de8dd9a08dd3c6cd0d6bebdb6158b32844f6 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 26 Aug 2015 00:29:14 +0200 Subject: create pkgcnfig dir before copying anything --- nxcomp/Makefile.in | 1 + nxcompext/Makefile.in | 1 + nxcompshad/Makefile.in | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index a8647cead..83da1ec4f 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -287,6 +287,7 @@ install.bin: install.lib: all ./mkinstalldirs $(DESTDIR)${libdir} ./mkinstalldirs $(DESTDIR)${includedir}/nx + ./mkinstalldirs $(DESTDIR)${pkgconfigdir} $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index b66a4c361..66388f86d 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -167,6 +167,7 @@ install.bin: install.lib: all ./mkinstalldirs $(DESTDIR)${libdir} + ./mkinstalldirs $(DESTDIR)${pkgconfigdir} ./mkinstalldirs $(DESTDIR)${includedir}/nx $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 5b1abebed..da10f7cad 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -76,7 +76,7 @@ man1dir = @mandir@/man1 VPATH = @srcdir@ libdir = @libdir@ includedir = @includedir@ -pkgconfigdir = @pkgconfigdir@ +pkgconfigdir = @libdir@/pkgconfig INSTALL = @INSTALL@ INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 @@ -201,6 +201,7 @@ install.bin: install.lib: all $(INSTALL_DIR) $(DESTDIR)${libdir} + $(INSTALL_DIR) $(DESTDIR)${pkgconfigdir} $(INSTALL_DIR) $(DESTDIR)${includedir}/nx $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} -- cgit v1.2.3 From 96a1c5edf09d9a613f142f20599696352aee51fb Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 26 Aug 2015 01:02:34 +0200 Subject: Fix "Makefile.in seems to ignore the --datarootdir setting" warning --- nxcomp/Makefile.in | 2 ++ nxcompext/Makefile.in | 2 ++ nxcompshad/Makefile.in | 2 ++ 3 files changed, 6 insertions(+) diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index 83da1ec4f..675a71d72 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 66388f86d..62dda4482 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 diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index da10f7cad..d13ad9fc7 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 -- cgit v1.2.3 From f8772b6fc2b40a22f851e20badab975177f50176 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 26 Aug 2015 01:06:28 +0200 Subject: adapt pkgconfigdir in nxcompshad --- nxcompshad/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index d13ad9fc7..2c961897b 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -78,7 +78,7 @@ man1dir = @mandir@/man1 VPATH = @srcdir@ libdir = @libdir@ includedir = @includedir@ -pkgconfigdir = @libdir@/pkgconfig +pkgconfigdir = @pkgconfigdir@ INSTALL = @INSTALL@ INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 -- cgit v1.2.3