retitle 560836 jwm: [PATCH] Makefile.in -- add DESTDIR support
thanks

Here is updated patch. This Adds install friendly DESTDIR support for
all variables:

    SYSCONF = $(DESTDIR)@SYSCONF@
    MANDIR = $(DESTDIR)@MANDIR@
    BINDIR = $(DESTDIR)@BINDIR@

Jari

>From 3bfddab87265399801f40408c3d3f4c18e93c7df Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 12 Dec 2009 20:10:37 +0200
Subject: [PATCH] Makefile.in: add DESTDIR support

Signed-off-by: Jari Aalto <[email protected]>
---
 Makefile.in     |    4 ++--
 src/Makefile.in |    7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a317076..a3f1505 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 
-SYSCONF = @SYSCONF@
-MANDIR = @MANDIR@
+SYSCONF = $(DESTDIR)@SYSCONF@
+MANDIR = $(DESTDIR)@MANDIR@
 VERSION = @VERSION@
 
 all:
diff --git a/src/Makefile.in b/src/Makefile.in
index 578597d..cb2b576 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
-BINDIR = @BINDIR@
+
+BINDIR = $(DESTDIR)@BINDIR@
 
 VPATH=.:os
 
@@ -22,7 +22,7 @@ all: $(EXE)
 install: all
 	strip $(EXE)
 	install -d $(BINDIR)
-	install $(EXE) $(BINDIR)/$(EXE)
+	install -m 0755 $(EXE) $(BINDIR)/$(EXE)
 
 depend:
 	makedepend -m -DMAKE_DEPEND -- $(CFLAGS) -- *.c
@@ -35,4 +35,3 @@ $(EXE): $(OBJECTS)
 
 clean:
 	rm -f $(OBJECTS) $(EXE) core
-
-- 
1.6.5

Reply via email to