aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/014_nxcompshad_makefile-uninstall.full.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-14 22:40:15 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-14 22:40:15 +0100
commitc621c22f820ec22fe7daabf37b7b577a41a3298f (patch)
tree519e1c46cfa0d312cc6ec49e31c6dc099947c701 /debian/patches/014_nxcompshad_makefile-uninstall.full.patch
parent4d6e1c4fbe549a77caa5ba0fc60e1bf668bf4a4b (diff)
downloadnx-libs-c621c22f820ec22fe7daabf37b7b577a41a3298f.tar.gz
nx-libs-c621c22f820ec22fe7daabf37b7b577a41a3298f.tar.bz2
nx-libs-c621c22f820ec22fe7daabf37b7b577a41a3298f.zip
Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already existing Makefile patches (012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_...).
Diffstat (limited to 'debian/patches/014_nxcompshad_makefile-uninstall.full.patch')
-rw-r--r--debian/patches/014_nxcompshad_makefile-uninstall.full.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/debian/patches/014_nxcompshad_makefile-uninstall.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall.full.patch
deleted file mode 100644
index 1a7888546..000000000
--- a/debian/patches/014_nxcompshad_makefile-uninstall.full.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Add install and uninstall stanzas to nxcompshad/Makefile
- Provide install and uninstall functionality in nxcompshad/Makefile.
-Forwarded: pending...
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2011-12-31
---- a/nxcompshad/Makefile.in
-+++ b/nxcompshad/Makefile.in
-@@ -76,8 +76,13 @@
- VPATH = @srcdir@
-
- INSTALL = @INSTALL@
-+INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_LINK = cp -av
-+DESTDIR =
-+RM_FILE = rm -f
-+RM_DIR = rmdir -p --ignore-fail-on-non-empty
-
- #
- # This should be autodetected.
-@@ -178,12 +183,38 @@
- fi
- touch depend.status
-
--install: install.bin install.man
-+install: install.bin install.lib install.man
-
- install.bin:
-
-+install.lib: all
-+ $(INSTALL_DIR) $(DESTDIR)$(prefix)/lib/nx
-+ $(INSTALL_DIR) $(DESTDIR)$(prefix)/include/nx
-+ $(INSTALL_DATA) libXcompshad.so.3.* $(DESTDIR)$(prefix)/lib/nx
-+ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)$(prefix)/lib/nx
-+ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)$(prefix)/lib/nx
-+ $(INSTALL_DATA) *.a $(DESTDIR)$(prefix)/lib/nx
-+ $(INSTALL_DATA) *.h $(DESTDIR)$(prefix)/include/nx
-+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-+
- install.man:
-
-+uninstall: uninstall.bin uninstall.lib uninstall.man
-+
-+uninstall.bin:
-+
-+uninstall.lib:
-+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3.*
-+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3
-+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so
-+ $(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.a
-+ for header in *.h; do $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/$$header; done
-+ $(RM_DIR) $(DESTDIR)$(prefix)/lib/nx/
-+ $(RM_DIR) $(DESTDIR)$(prefix)/include/nx/
-+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-+
-+uninstall.man:
-+
- clean:
- -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \
- $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe