[Qemacs-commit] qemacs Makefile

[Charlie Gordon]

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

Modified files:
        .              : Makefile 

Log message:
        cleaned up install target, added uninstall and rebuild

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

Patches:
Index: Makefile
===================================================================
RCS file: /cvsroot/qemacs/qemacs/Makefile,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- Makefile    17 Apr 2008 08:14:35 -0000      1.43
+++ Makefile    17 Apr 2008 08:42:10 -0000      1.44
@@ -1,6 +1,6 @@
 # QEmacs, tiny but powerful multimode editor
 #
-# Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
+# Copyright (c) 2000-2002 Fabrice Bellard.
 # Copyright (c) 2000-2008 Charlie Gordon.
 #
 # This library is free software; you can redistribute it and/or
@@ -201,11 +201,11 @@
 tqe.o: basemodules.txt
 
 allmodules.txt: $(SRCS) Makefile
-       echo '/* This file was generated automatically */'  > $@
+       @echo '/* This file was generated automatically */' > $@
        grep -h ^qe_module_init $(SRCS)                    >> $@
 
 basemodules.txt: $(TSRCS) Makefile
-       echo '/* This file was generated automatically */'  > $@
+       @echo '/* This file was generated automatically */' > $@
        grep -h ^qe_module_init $(TSRCS)                   >> $@
 endif
 
@@ -241,10 +241,9 @@
 KMAPS=Arabic.kmap ArmenianEast.kmap ArmenianWest.kmap Chinese-CJ.kmap \
       Cyrillic.kmap Czech.kmap DE-RU.kmap Danish.kmap Dutch.kmap \
       Esperanto.kmap Ethiopic.kmap French.kmap Georgian.kmap German.kmap \
-      Greek.kmap GreekMono.kmap Guarani.kmap HebrewP.kmap \
-      Hungarian.kmap \
-      KOI8_R.kmap Lithuanian.kmap Mnemonic.kmap Polish.kmap \
-      Russian.kmap SGML.kmap TeX.kmap Troff.kmap VNtelex.kmap \
+      Greek.kmap GreekMono.kmap Guarani.kmap HebrewP.kmap Hungarian.kmap    \
+      KOI8_R.kmap Lithuanian.kmap Mnemonic.kmap Polish.kmap Russian.kmap    \
+      SGML.kmap TeX.kmap Troff.kmap VNtelex.kmap                            \
       Vietnamese.kmap XKB_iso8859-4.kmap \
       DanishAlternate.kmap GreekBible.kmap Polytonic.kmap Spanish.kmap \
       Thai.kmap VietnameseTelex.kmap Welsh.kmap \
@@ -342,19 +341,32 @@
        rm -f config.h config.mak
 
 install: $(TARGETS) qe.1
-       install -d $(DESTDIR)$(prefix)/{bin,man/man1,share}
-       install -s -m 755 qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
+       $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/man/man1
+       $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/share/qe
+       $(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
        ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe$(EXE)
 ifdef CONFIG_FFMPEG
        ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/ffplay$(EXE)
 endif
-       mkdir -p $(DESTDIR)$(prefix)/share/qe
-       install kmaps ligatures $(DESTDIR)$(prefix)/share/qe
-       install qe.1 $(DESTDIR)$(prefix)/man/man1
+       $(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(prefix)/share/qe
+       $(INSTALL) -m 644 qe.1 $(DESTDIR)$(prefix)/man/man1
 ifdef CONFIG_HTML
-       install -s -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin
+       $(INSTALL) -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin
 endif
 
+uninstall:
+       rm -f $(DESTDIR)$(prefix)/bin/qemacs$(EXE)   \
+             $(DESTDIR)$(prefix)/bin/qe$(EXE)       \
+             $(DESTDIR)$(prefix)/bin/ffplay$(EXE)   \
+             $(DESTDIR)$(prefix)/man/man1/qe.1      \
+             $(DESTDIR)$(prefix)/share/qe/kmaps     \
+             $(DESTDIR)$(prefix)/share/qe/ligatures \
+             $(DESTDIR)$(prefix)/bin/html2png$(EXE)
+
+rebuild:
+       ./configure && $(MAKE) clean all
+
 TAGS: force
        etags *.[ch]