diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-13 13:13:55 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-13 13:13:55 +0200 |
| commit | 35613d1dcaa47fbbc6aacc95fdda16b48dd8e740 (patch) | |
| tree | 042738ceeb6c4cb69780f4f78dba18067c76f091 /nxcomp | |
| parent | 734da2139827c54acff670628fedbfe9441cb913 (diff) | |
| parent | f5eff9bc0a1134a16b1a6e67bfe3d0b4d7cd49e9 (diff) | |
| download | nx-libs-35613d1dcaa47fbbc6aacc95fdda16b48dd8e740.tar.gz nx-libs-35613d1dcaa47fbbc6aacc95fdda16b48dd8e740.tar.bz2 nx-libs-35613d1dcaa47fbbc6aacc95fdda16b48dd8e740.zip | |
Merge branch 'sunweaver-pr/nxcomp+ext+shad-system-wide-headers' into 3.6.x
Reviewed by Ulrich Sibiller <uli42@gmx.de>, approval given on Mon, 13 Jun 2016 02:49:19 -0700.
Diffstat (limited to 'nxcomp')
| -rw-r--r-- | nxcomp/Makefile.in | 8 | ||||
| -rw-r--r-- | nxcomp/nxcomp.pc.in | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index 8fc37407f..759ab6a4f 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -283,8 +283,12 @@ install.lib: all $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir} - $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) NX.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) NXalert.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) NXpack.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) NXproto.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) NXvars.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) nxcomp.pc $(DESTDIR)${pkgconfigdir} echo "Running ldconfig tool, this may take a while..." && ldconfig || true @@ -301,10 +305,8 @@ uninstall.lib: $(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE) $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h - $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h - $(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h $(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcomp.pc diff --git a/nxcomp/nxcomp.pc.in b/nxcomp/nxcomp.pc.in index f4d3a7efb..f0963aa17 100644 --- a/nxcomp/nxcomp.pc.in +++ b/nxcomp/nxcomp.pc.in @@ -10,6 +10,6 @@ Version: @VERSION@ #Requires: libjpeg zlib Requires: libpng Requires.private: x11 -Cflags: -I${includedir} -I${includedir}/nx +Cflags: -I${includedir} Libs: -L${libdir} -lXcomp |