From: Martin Gysel Date: Mon, 17 Oct 2011 13:53:59 +0000 (+0200) Subject: use DESTDIR according to my understanding of GNU standards X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=e9386057b6a4cddb09ac3391634ccbbe6cdb39ef;p=ext%2Fsubsurface.git use DESTDIR according to my understanding of GNU standards 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 Signed-off-by: Linus Torvalds --- diff --git a/Makefile b/Makefile index edd88cb..3e0d8b1 100644 --- 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)