From c621c22f820ec22fe7daabf37b7b577a41a3298f Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 14 Feb 2012 22:40:15 +0100
Subject: Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already
 existing Makefile patches (012_nxcomp..., 013_nxcompext_...,
 014_nxcompshad_...).

---
 .../013_nxcompext_makefile-uninstall.full.patch    | 53 ----------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 debian/patches/013_nxcompext_makefile-uninstall.full.patch

(limited to 'debian/patches/013_nxcompext_makefile-uninstall.full.patch')

diff --git a/debian/patches/013_nxcompext_makefile-uninstall.full.patch b/debian/patches/013_nxcompext_makefile-uninstall.full.patch
deleted file mode 100644
index 97e4f03f6..000000000
--- a/debian/patches/013_nxcompext_makefile-uninstall.full.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Add install and uninstall stanzas to nxcompext/Makefile
- Provide install and uninstall functionality in nxcompext/Makefile.
-Forwarded: pending...
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2011-12-31
---- nx-libs.orig/nxcompext/Makefile.in	2011-12-05 09:20:15.000000000 +0100
-+++ nx-libs/nxcompext/Makefile.in	2011-12-05 09:24:37.000000000 +0100
-@@ -60,7 +60,9 @@
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
--
-+INSTALL_LINK    = cp -av
-+DESTDIR         =
-+RM_FILE         = rm -f
- #
- # This should be autodetected.
- #
-@@ -147,12 +149,33 @@
- 		fi
- 		touch depend.status
- 
--install:	install.bin install.man
-+install:       install.bin install.lib install.man
- 
- install.bin:
- 
-+install.lib: all
-+	./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx
-+	./mkinstalldirs $(DESTDIR)$(prefix)/include/nx
-+	$(INSTALL_DATA) libXcompext.so.*        $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_LINK) libXcompext.so          $(DESTDIR)$(prefix)/lib/nx
-+	$(INSTALL_DATA) NX*.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/libXcompext.so.*
-+	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlib.h
-+	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlibint.h
-+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-+
-+uninstall.man:
-+
- clean:
- 		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
- 		@ALL@
-- 
cgit v1.2.3