[packages/slang.git] / slang-DESTDIR.patch

diff -Nru slang-1.4.3/modules/Makefile.in slang-1.4.3.new/modules/Makefile.in
--- slang-1.4.3/modules/Makefile.in	Sun Feb  4 07:32:54 2001
+++ slang-1.4.3.new/modules/Makefile.in	Tue Feb  6 11:05:57 2001
@@ -12,7 +12,7 @@
 #---------------------------------------------------------------------------
 # Installation location of the modules
 #---------------------------------------------------------------------------
-MODULE_INSTALL_DIR = @libdir@/slang/modules
+MODULE_INSTALL_DIR = @libdir@/slang
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
 MKINSDIR	= ../autoconf/mkinsdir.sh
@@ -20,7 +20,6 @@
 # DESTDIR is designed to facilitate making packages.  Normally it is empty
 #---------------------------------------------------------------------------
 DESTDIR =
-DEST_MODULEDIR = $(DESTDIR)$(MODULE_INSTALL_DIR)
 #---------------------------------------------------------------------------
 RPATH = @RPATH@
 
@@ -41,11 +40,11 @@
 	$(CC_SHARED) $(INCS) fcntl-module.c -o fcntl-module.so $(LIBS)
 
 install: all
-	-$(MKINSDIR) $(DEST_MODULEDIR)
+	-$(MKINSDIR) $(DESTDIR)$(MODULE_INSTALL_DIR)
 	@for i in $(MODULES); \
 	do \
-		echo $(INSTALL_DATA) $$i $(DEST_MODULEDIR); \
-		$(INSTALL_DATA) $$i $(DEST_MODULEDIR); \
+		echo $(INSTALL_DATA) $$i $(DESTDIR)$(MODULE_INSTALL_DIR); \
+		$(INSTALL_DATA) $$i $(DESTDIR)$(MODULE_INSTALL_DIR); \
 	done
 clean:
 	-/bin/rm -f $(MODULES) *~
diff -Nru slang-1.4.3/src/Makefile.in slang-1.4.3.new/src/Makefile.in
--- slang-1.4.3/src/Makefile.in	Sun Feb  4 07:33:04 2001
+++ slang-1.4.3.new/src/Makefile.in	Tue Feb  6 11:03:14 2001
@@ -34,8 +34,8 @@
 #---------------------------------------------------------------------------
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-install_lib_dir = @libdir@
-install_include_dir = @includedir@
+libdir = @libdir@
+includedir = @includedir@
 install_doc_dir = $(prefix)/doc/slang
 DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
 MODULE_INSTALL_DIR = @libdir@/slang/modules
@@ -43,9 +43,6 @@
 # DESTDIR is designed to facilitate making packages.  Normally it is empty
 #---------------------------------------------------------------------------
 DESTDIR =
-DEST_LIBDIR = $(DESTDIR)$(install_lib_dir)
-DEST_DOCDIR = $(DESTDIR)$(install_doc_dir)
-DEST_INCDIR = $(DESTDIR)$(install_include_dir)
 
 #---------------------------------------------------------------------------
 # Misc commands (safe to leave these untouched)
@@ -135,41 +132,38 @@
 # Intallation rules
 #---------------------------------------------------------------------------
 install: install_basic_lib install_docs
-install_basic_lib: $(DEST_LIBDIR) $(DEST_INCDIR) $(OBJDIR_NORMAL_LIB)
-	@echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)
-	$(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)
-	$(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB)
-	@echo installing slang.h and slcurses.h in $(DEST_INCDIR)
-	$(INSTALL_DATA) $(SRCDIR)/slang.h $(DEST_INCDIR)
-	$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DEST_INCDIR)
+
+install_basic_lib: $(OBJDIR_NORMAL_LIB)
+	$(MKINSDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+	@echo installing $(OBJDIR_NORMAL_LIB) in $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DESTDIR)$(libdir)
+	$(RANLIB) $(DESTDIR)/$(libdir)/$(NORMAL_LIB)
+	@echo installing slang.h and slcurses.h in $(DESTDIR)$(includedir)
+	$(INSTALL_DATA) $(SRCDIR)/slang.h $(DESTDIR)$(includedir)
+	$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DESTDIR)$(includedir)
+
 install_docs: $(DEST_DOCDIR)
+	$(MKINSDIR) $(DESTDIR)$(install_doc_dir)
 	@for i in $(DOC_FILES); \
 	do \
-		echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
-		$(INSTALL_DATA) $$i $(DEST_DOCDIR); \
+		echo $(INSTALL_DATA) $$i $(DESTDIR)$(install_doc_dir); \
+		$(INSTALL_DATA) $$i $(DESTDIR)$(install_doc_dir); \
 	done
-$(DEST_DOCDIR):
-	$(MKINSDIR) $(DEST_DOCDIR)
-$(DEST_INCDIR):
-	$(MKINSDIR) $(DEST_INCDIR)
-$(DEST_LIBDIR):
-	$(MKINSDIR) $(DEST_LIBDIR)
+
 install-elf: elf install
-	-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
-	-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
-	@echo installing $(ELFLIB_MAJOR_MINOR) in $(DEST_LIBDIR)
-	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)
+	$(MKINSDIR) $(DESTDIR)$(libdir)
+	@echo installing $(ELFLIB_MAJOR_MINOR) in $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DESTDIR)$(libdir)
 	@echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
-	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
+	-cd $(DESTDIR)$(libdir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
 	@echo ""
-	@echo $(ELFLIB_MAJOR_MINOR) created in $(DEST_LIBDIR).
+	@echo $(ELFLIB_MAJOR_MINOR) created in $(DESTDIR)$(libdir).
 	@echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
 	@echo ""
+
 install-links:
-	-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
-	-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
-	cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
-	cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
+	cd $(DESTDIR)$(libdir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
+	cd $(DESTDIR)$(libdir); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
 	@echo
 	@echo A link $(ELFLIB_MAJOR) to $(ELFLIB_MAJOR_MINOR) was created.
 	@echo A link $(ELFLIB) to $(ELFLIB_MAJOR) was created.
Commit	Line	Data
232269e3	1	diff -Nru slang-1.4.3/modules/Makefile.in slang-1.4.3.new/modules/Makefile.in
	2	--- slang-1.4.3/modules/Makefile.in Sun Feb 4 07:32:54 2001
	3	+++ slang-1.4.3.new/modules/Makefile.in Tue Feb 6 11:05:57 2001
	4	@@ -12,7 +12,7 @@
	5	#---------------------------------------------------------------------------
	6	# Installation location of the modules
	7	#---------------------------------------------------------------------------
	8	-MODULE_INSTALL_DIR = @libdir@/slang/modules
	9	+MODULE_INSTALL_DIR = @libdir@/slang
	10	INSTALL = @INSTALL@
	11	INSTALL_DATA = @INSTALL_DATA@
	12	MKINSDIR = ../autoconf/mkinsdir.sh
	13	@@ -20,7 +20,6 @@
	14	# DESTDIR is designed to facilitate making packages. Normally it is empty
	15	#---------------------------------------------------------------------------
	16	DESTDIR =
	17	-DEST_MODULEDIR = $(DESTDIR)$(MODULE_INSTALL_DIR)
	18	#---------------------------------------------------------------------------
	19	RPATH = @RPATH@
	20
	21	@@ -41,11 +40,11 @@
	22	$(CC_SHARED) $(INCS) fcntl-module.c -o fcntl-module.so $(LIBS)
	23
	24	install: all
	25	- -$(MKINSDIR) $(DEST_MODULEDIR)
	26	+ -$(MKINSDIR) $(DESTDIR)$(MODULE_INSTALL_DIR)
	27	@for i in $(MODULES); \
	28	do \
	29	- echo $(INSTALL_DATA) $$i $(DEST_MODULEDIR); \
	30	- $(INSTALL_DATA) $$i $(DEST_MODULEDIR); \
	31	+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(MODULE_INSTALL_DIR); \
	32	+ $(INSTALL_DATA) $$i $(DESTDIR)$(MODULE_INSTALL_DIR); \
	33	done
	34	clean:
	35	-/bin/rm -f $(MODULES) *~
	36	diff -Nru slang-1.4.3/src/Makefile.in slang-1.4.3.new/src/Makefile.in
	37	--- slang-1.4.3/src/Makefile.in Sun Feb 4 07:33:04 2001
	38	+++ slang-1.4.3.new/src/Makefile.in Tue Feb 6 11:03:14 2001
	39	@@ -34,8 +34,8 @@
	40	#---------------------------------------------------------------------------
	41	prefix = @prefix@
	42	exec_prefix = @exec_prefix@
	43	-install_lib_dir = @libdir@
	44	-install_include_dir = @includedir@
	45	+libdir = @libdir@
	46	+includedir = @includedir@
	47	install_doc_dir = $(prefix)/doc/slang
	48	DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
	49	MODULE_INSTALL_DIR = @libdir@/slang/modules
	50	@@ -43,9 +43,6 @@
	51	# DESTDIR is designed to facilitate making packages. Normally it is empty
	52	#---------------------------------------------------------------------------
	53	DESTDIR =
	54	-DEST_LIBDIR = $(DESTDIR)$(install_lib_dir)
	55	-DEST_DOCDIR = $(DESTDIR)$(install_doc_dir)
	56	-DEST_INCDIR = $(DESTDIR)$(install_include_dir)
	57
	58	#---------------------------------------------------------------------------
	59	# Misc commands (safe to leave these untouched)
	60	@@ -135,41 +132,38 @@
	61	# Intallation rules
	62	#---------------------------------------------------------------------------
	63	install: install_basic_lib install_docs
	64	-install_basic_lib: $(DEST_LIBDIR) $(DEST_INCDIR) $(OBJDIR_NORMAL_LIB)
65	- @echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)
66	- $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)
67	- $(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB)
68	- @echo installing slang.h and slcurses.h in $(DEST_INCDIR)
69	- $(INSTALL_DATA) $(SRCDIR)/slang.h $(DEST_INCDIR)
70	- $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DEST_INCDIR)
71	+
72	+install_basic_lib: $(OBJDIR_NORMAL_LIB)
73	+ $(MKINSDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
74	+ @echo installing $(OBJDIR_NORMAL_LIB) in $(DESTDIR)$(libdir)
75	+ $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DESTDIR)$(libdir)
76	+ $(RANLIB) $(DESTDIR)/$(libdir)/$(NORMAL_LIB)
77	+ @echo installing slang.h and slcurses.h in $(DESTDIR)$(includedir)
78	+ $(INSTALL_DATA) $(SRCDIR)/slang.h $(DESTDIR)$(includedir)
79	+ $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DESTDIR)$(includedir)
80	+
81	install_docs: $(DEST_DOCDIR)
82	+ $(MKINSDIR) $(DESTDIR)$(install_doc_dir)
83	@for i in $(DOC_FILES); \
84	do \
85	- echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
86	- $(INSTALL_DATA) $$i $(DEST_DOCDIR); \
87	+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(install_doc_dir); \
88	+ $(INSTALL_DATA) $$i $(DESTDIR)$(install_doc_dir); \
89	done
90	-$(DEST_DOCDIR):
91	- $(MKINSDIR) $(DEST_DOCDIR)
92	-$(DEST_INCDIR):
93	- $(MKINSDIR) $(DEST_INCDIR)
94	-$(DEST_LIBDIR):
95	- $(MKINSDIR) $(DEST_LIBDIR)
96	+
97	install-elf: elf install
98	- -$(RM) $(DEST_LIBDIR)/$(ELFLIB)
99	- -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
100	- @echo installing $(ELFLIB_MAJOR_MINOR) in $(DEST_LIBDIR)
101	- $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)
102	+ $(MKINSDIR) $(DESTDIR)$(libdir)
103	+ @echo installing $(ELFLIB_MAJOR_MINOR) in $(DESTDIR)$(libdir)
104	+ $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DESTDIR)$(libdir)
105	@echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
106	- -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
107	+ -cd $(DESTDIR)$(libdir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
108	@echo ""
109	- @echo $(ELFLIB_MAJOR_MINOR) created in $(DEST_LIBDIR).
110	+ @echo $(ELFLIB_MAJOR_MINOR) created in $(DESTDIR)$(libdir).
111	@echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
112	@echo ""
113	+
114	install-links:
115	- -$(RM) $(DEST_LIBDIR)/$(ELFLIB)
116	- -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
117	- cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
118	- cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
119	+ cd $(DESTDIR)$(libdir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
120	+ cd $(DESTDIR)$(libdir); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
121	@echo
122	@echo A link $(ELFLIB_MAJOR) to $(ELFLIB_MAJOR_MINOR) was created.
123	@echo A link $(ELFLIB) to $(ELFLIB_MAJOR) was created.