slang-users mailing list

[2010 Date Index] [2010 Thread Index] [Other years]
[Thread Prev] [Thread Next]      [Date Prev] [Date Next]

[slang-users] [PATCH] You should not set the value of DESTDIR in your Makefile at all


Hi,

Please find attached simple patch to remove DESTDIR setting from all
Makefiles.

According the http://www.gnu.org/prep/standards/html_node/DESTDIR.html
page the DESTDIR variable should not be set in Makefiles at all.

Thanks.

-- 
+-------------------------------------------+
| Marcel Telka   e-mail:   marcel@xxxxxxxx  |
|                homepage: http://telka.sk/ |
|                jabber:   marcel@xxxxxxxxx |
+-------------------------------------------+
diff -urN slang-2.2.2.orig/autoconf/Makefile.in slang-2.2.2/autoconf/Makefile.in
--- slang-2.2.2.orig/autoconf/Makefile.in	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/autoconf/Makefile.in	2010-02-11 20:26:14.298051227 +0100
@@ -13,7 +13,6 @@
 #---------------------------------------------------------------------------
 # DESTDIR is designed to facilitate making packages.  Normally it is empty
 #---------------------------------------------------------------------------
-DESTDIR =
 DEST_PKGCONFIGDIR = $(DESTDIR)$(pkgconfigdir)
 #
 MKINSDIR = autoconf/mkinsdir.sh
diff -urN slang-2.2.2.orig/mkfiles/makefile.m32 slang-2.2.2/mkfiles/makefile.m32
--- slang-2.2.2.orig/mkfiles/makefile.m32	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/mkfiles/makefile.m32	2010-02-11 20:28:34.355694627 +0100
@@ -4,7 +4,6 @@
 MFLAGS = COPY="cmd /c copy" RM=del
 
 # DESTDIR is used for building a package for use on another machine.
-DESTDIR =
 PREFIX = /mingw/local
 CONFDIR = /mingw/local/etc
 #
@@ -26,7 +25,7 @@
 #
 # Note the use of X- below.  Windows regards '=' as a commandline whitespace 
 # and needs to be quoted.  However I have not been able to figure out how to
-# do that in th econtext of the mingw32-make command parser.  As a major hack
+# do that in the context of the mingw32-make command parser.  As a major hack
 # I added the X- prefix and modified mkfiles/install.sl to remove the X-.
 install: all
 	mkfiles/runslsh.bat -i mkfiles/install.sl --destdir="X-$(DESTDIR)" --prefix="$(PREFIX)" install
diff -urN slang-2.2.2.orig/modules/Makefile.in slang-2.2.2/modules/Makefile.in
--- slang-2.2.2.orig/modules/Makefile.in	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/modules/Makefile.in	2010-02-11 20:29:13.850685238 +0100
@@ -67,7 +67,6 @@
 #---------------------------------------------------------------------------
 # DESTDIR is designed to facilitate making packages.  Normally it is empty
 #---------------------------------------------------------------------------
-DESTDIR =
 DEST_MODULEDIR	= $(DESTDIR)$(MODULE_INSTALL_DIR)
 DEST_SLSH_DIR	= $(DESTDIR)$(SLSH_DIR)
 DEST_CMAPSDIR	= $(DESTDIR)$(CMAPS_DIR)
diff -urN slang-2.2.2.orig/slsh/Makefile.in slang-2.2.2/slsh/Makefile.in
--- slang-2.2.2.orig/slsh/Makefile.in	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/slsh/Makefile.in	2010-02-11 20:25:49.207004191 +0100
@@ -46,7 +46,6 @@
 #---------------------------------------------------------------------------
 # DESTDIR is designed to facilitate making packages.  Normally it is empty
 #---------------------------------------------------------------------------
-DESTDIR		=
 BIN_DIR		= @bindir@
 MAN_DIR		= @mandir@/man1
 DEST_LIB_DIR	= -L$(DESTDIR)@libdir@
diff -urN slang-2.2.2.orig/src/Makefile.in slang-2.2.2/src/Makefile.in
--- slang-2.2.2.orig/src/Makefile.in	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/src/Makefile.in	2010-02-11 20:25:06.858830195 +0100
@@ -51,7 +51,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)





[2010 date index] [2010 thread index]
[Thread Prev] [Thread Next]      [Date Prev] [Date Next]