[Qemacs-commit] qemacs Makefile

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        08/04/17 08:14:35

Modified files:
        .              : Makefile 

Log message:
        fixed use of DESTDIR variable in make install

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/Makefile?cvsroot=qemacs&r1=1.42&r2=1.43

Patches:
Index: Makefile
===================================================================
RCS file: /cvsroot/qemacs/qemacs/Makefile,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- Makefile    15 Apr 2008 08:32:12 -0000      1.42
+++ Makefile    17 Apr 2008 08:14:35 -0000      1.43
@@ -19,10 +19,6 @@
 
 include config.mak
 
-ifneq ($(DESTDIR),)
-  prefix=$(DESTDIR)
-endif
-
 ifeq ($(CC),gcc)
   CFLAGS   := -Wall -g -O2 -funsigned-char
   # do not warn about zero-length formats.
@@ -346,17 +342,17 @@
        rm -f config.h config.mak
 
 install: $(TARGETS) qe.1
-       install -d $(prefix)/{bin,man/man1,share}
-       install -m 755 qe$(EXE) $(prefix)/bin/qemacs$(EXE)
-       ln -sf qemacs $(prefix)/bin/qe$(EXE)
+       install -d $(DESTDIR)$(prefix)/{bin,man/man1,share}
+       install -s -m 755 qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
+       ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe$(EXE)
 ifdef CONFIG_FFMPEG
-       ln -sf qemacs$(EXE) $(prefix)/bin/ffplay$(EXE)
+       ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/ffplay$(EXE)
 endif
-       mkdir -p $(prefix)/share/qe
-       install kmaps ligatures $(prefix)/share/qe
-       install qe.1 $(prefix)/man/man1
+       mkdir -p $(DESTDIR)$(prefix)/share/qe
+       install kmaps ligatures $(DESTDIR)$(prefix)/share/qe
+       install qe.1 $(DESTDIR)$(prefix)/man/man1
 ifdef CONFIG_HTML
-       install -m 755 -s html2png$(EXE) $(prefix)/bin
+       install -s -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin
 endif
 
 TAGS: force