]> git.tdb.fi Git - ext/subsurface.git/commitdiff
use DESTDIR according to my understanding of GNU standards
authorMartin Gysel <me@bearsh.org>
Mon, 17 Oct 2011 13:53:59 +0000 (15:53 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Oct 2011 17:48:40 +0000 (10:48 -0700)
make DESRDIR a prefix of everything according my understanding
of the GNU standards. This is also useful(/needed) for installing
in Gentoo. Declare BINDIR for bin/program directory.

Signed-off-by: Martin Gysel <me@bearsh.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Makefile

index edd88cb68e84846d3e50d48df67e5ac01034e9f7..3e0d8b199cd378f86bd651cc8cd6ca2072b2c498 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ INSTALL=install
 
 # these locations seem to work for SuSE and Fedora
 # prefix = $(HOME)
-prefix = /usr
-DESTDIR = $(prefix)/bin
+prefix = $(DESTDIR)/usr
+BINDIR = $(prefix)/bin
 DATADIR = $(prefix)/share
 DESKTOPDIR = $(DATADIR)/applications
 ICONPATH = $(DATADIR)/icons/hicolor
@@ -59,8 +59,8 @@ $(NAME): $(OBJS)
        $(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
 
 install: $(NAME)
-       $(INSTALL) -d -m 755 $(DESTDIR)
-       $(INSTALL) $(NAME) $(DESTDIR)
+       $(INSTALL) -d -m 755 $(BINDIR)
+       $(INSTALL) $(NAME) $(BINDIR)
        $(INSTALL) -d -m 755 $(DESKTOPDIR)
        $(INSTALL) $(DESKTOPFILE) $(DESKTOPDIR)
        $(INSTALL) -d -m 755 $(ICONDIR)