[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 04/09: Fixes for `uninstall' target.
|
From: |
Werner LEMBERG |
|
Subject: |
[groff] 04/09: Fixes for `uninstall' target. |
|
Date: |
Sun, 30 Mar 2014 20:13:35 +0000 |
wl pushed a commit to branch master
in repository groff.
commit ea25b701621275bb836b5aca8ff7f6270d10e682
Author: Steffen Nurpmeso <address@hidden>
Date: Sun Mar 30 09:07:04 2014 +0200
Fixes for `uninstall' target.
* Makefile.in (uninstall_dirs): Use `DESTDIR'.
* src/libs/libgroff/Makefile.sub (uninstall_charset_data): Typo.
* src/roff/groff/Makefile.sub (uninstall_sub): Typo.
* src/roff/grog/Makefile.sub (uninstall_sub): Minor.
* contrib/glilypond/Makefile.sub (uninstall_sub): Typo.
* contrib/groffer/Makefile.sub (uninstall_sub): Typo.
---
ChangeLog | 12 ++++++++++++
Makefile.in | 35 ++++++++++++++++++++++++++---------
contrib/glilypond/ChangeLog | 4 ++++
contrib/glilypond/Makefile.sub | 6 +++---
contrib/groffer/ChangeLog | 4 ++++
contrib/groffer/Makefile.sub | 4 ++--
src/libs/libgroff/Makefile.sub | 2 +-
src/roff/groff/Makefile.sub | 6 +++---
src/roff/grog/Makefile.sub | 11 +++++------
9 files changed, 60 insertions(+), 24 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 27f4be9..f0039e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2014-03-30 Steffen Nurpmeso <address@hidden>
+ Fixes for `uninstall' target.
+
+ * Makefile.in (uninstall_dirs): Use `DESTDIR'.
+
+ * src/libs/libgroff/Makefile.sub (uninstall_charset_data): Typo.
+
+ * src/roff/groff/Makefile.sub (uninstall_sub): Typo.
+
+ * src/roff/grog/Makefile.sub (uninstall_sub): Minor.
+
+2014-03-30 Steffen Nurpmeso <address@hidden>
+
* src/roff/grog/Makefile.sub (install_data): Typo.
2014-03-29 Steffen Nurpmeso <address@hidden>
diff --git a/Makefile.in b/Makefile.in
index f629fb7..1b49423 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
# Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
#
-# Last update: 29 Mar 2014
+# Last update: 30 Mar 2014
#
# This file is part of groff.
#
@@ -948,14 +948,31 @@ uninstall: uninstall_sub uninstall_dirs
.PHONY: uninstall_dirs
# Use `rmdir' here so that the directories are only removed if they are empty.
uninstall_dirs:
- -rm -f $(dataprogramdir)/current
- -rmdir $(man1dir) $(man5dir) $(man7dir) $(manroot) \
- $(tmacdir) $(systemtmacdir) $(localtmacdir) \
- $(fontdir) $(localfontdir) $(oldfontdir) $(bindir) \
- $(datasubdir) $(dataprogramdir) $(infodir) \
- $(exampledir) $(htmldocdir) $(pdfdocdir) $(docdir) \
- $(libprogramdir) $(libdir) \
- $(datadir)/doc/groff $(datadir)/doc $(datadir) 2>/dev/null || :
+ -rm -f $(DESTDIR)$(dataprogramdir)/current
+ -rmdir \
+ $(DESTDIR)$(man1dir) \
+ $(DESTDIR)$(man5dir) \
+ $(DESTDIR)$(man7dir) \
+ $(DESTDIR)$(manroot) \
+ $(DESTDIR)$(tmacdir) \
+ $(DESTDIR)$(systemtmacdir) \
+ $(DESTDIR)$(localtmacdir) \
+ $(DESTDIR)$(fontdir) \
+ $(DESTDIR)$(localfontdir) \
+ $(DESTDIR)$(oldfontdir) \
+ $(DESTDIR)$(bindir) \
+ $(DESTDIR)$(datasubdir) \
+ $(DESTDIR)$(dataprogramdir) \
+ $(DESTDIR)$(libprogramdir) \
+ $(DESTDIR)$(libdir) \
+ $(DESTDIR)$(infodir) \
+ $(DESTDIR)$(exampledir) \
+ $(DESTDIR)$(htmldocdir) \
+ $(DESTDIR)$(pdfdocdir) \
+ $(DESTDIR)$(docdir) \
+ $(DESTDIR)$(datadir)/doc/groff \
+ $(DESTDIR)$(datadir)/doc \
+ $(DESTDIR)$(datadir) 2>/dev/null || :
.PHONY: check
check:
diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index 190518d..956bdc7 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-30 Steffen Nurpmeso <address@hidden>
+
+ * Makefile.sub (uninstall_sub): Typo.
+
2014-03-11 Ingo Schwarze <address@hidden> (tiny change)
* Makefile.sub (install_data): POSIX conformance.
diff --git a/contrib/glilypond/Makefile.sub b/contrib/glilypond/Makefile.sub
index 0ff5e3e..7de7059 100644
--- a/contrib/glilypond/Makefile.sub
+++ b/contrib/glilypond/Makefile.sub
@@ -2,12 +2,12 @@
# File position: <groff-source>/contrib/lilypond/Makefile.sub
-# Copyright (C) 2013
+# Copyright (C) 2013, 2014
# Free Software Foundation, Inc.
# Written by Werner Lemberg <address@hidden> and
# Bernd Warken <address@hidden>.
-# Last update: 25 Apr 2013
+# Last update: 30 Mar 2013
# This file is part of `glilypond' which is part of `groff'.
@@ -72,7 +72,7 @@ install_data: glilypond $(GLILYPOND_LIB)
uninstall_sub:
$(RM) $(DESTDIR)$(bindir)/glilypond;
- for f in $(GLILYPOND_); do \
+ for f in $(GLILYPOND_LIB_); do \
$(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
done
-rmdir $(DESTDIR)$(glilypond_dir)
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 11c262b..ad17574 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-30 Steffen Nurpmeso <address@hidden>
+
+ * Makefile.sub (uninstall_sub): Typo.
+
2014-03-27 Werner LEMBERG <address@hidden>
Fix `make install'.
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
index 1a68f82..e98b7bd 100644
--- a/contrib/groffer/Makefile.sub
+++ b/contrib/groffer/Makefile.sub
@@ -7,7 +7,7 @@
# Written by Werner Lemberg <address@hidden> and
# Bernd Warken <address@hidden>.
-# Last update: 27 Mar 2014
+# Last update: 30 Mar 2014
# This file is part of `groffer' which is part of `groff'.
@@ -106,7 +106,7 @@ install_data: groffer
uninstall_sub:
$(RM) $(DESTDIR)$(bindir)/groffer
for f in $(ROFF2PROGS); do $(RM) $(DESTDIR)$(bindir)/$$f; done
- for f in $(GROFFER_PERL_) version.sh; do \
+ for f in $(GROFFER_PERL) version.sh; do \
$(RM) $(DESTDIR)$(groffer_dir)/$$f; \
done
-rmdir $(DESTDIR)$(libdir)/groff/groffer
diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub
index ac83892..bbdd447 100644
--- a/src/libs/libgroff/Makefile.sub
+++ b/src/libs/libgroff/Makefile.sub
@@ -172,7 +172,7 @@ install_charset_data:
uninstall_sub: uninstall_charset_data
uninstall_charset_data:
- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+ -if test -f $(DESTDIR)$(libdir)/charset.alias; then \
sed -f ref-del.sed $(DESTDIR)$(libdir)/charset.alias \
> $(DESTDIR)$(libdir)/t-charset.alias; \
if grep '^# Packages using this file: $$' \
diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
index 6b56c3d..238d423 100644
--- a/src/roff/groff/Makefile.sub
+++ b/src/roff/groff/Makefile.sub
@@ -2,13 +2,13 @@
# File position: <groff-source>/src/roff/groff/Makefile.sub
-# Copyright (C) 1993-2013
+# Copyright (C) 1993-2014
# Free Software Foundation, Inc.
# Rewritten by Bernd Warken <address@hidden> and
# Werner LEMBERG <address@hidden>
-# Last update: 06 May 2013
+# Last update: 30 Mar 2014
# `groff' is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@ uninstall_sub:
$(RM) $(DESTDIR)$(libprogramdir)/$$f; \
done
-test -d $(DESTDIR)$(libprogramdir) \
- && -rmdir $(DESTDIR)$(libprogramdir)
+ && rmdir $(DESTDIR)$(libprogramdir)
########################################################################
diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub
index 16aa168..e6a568e 100644
--- a/src/roff/grog/Makefile.sub
+++ b/src/roff/grog/Makefile.sub
@@ -69,13 +69,12 @@ install_data: grog
.PHONY: uninstall_data
uninstall_sub:
- -$(RM) "$(DESTDIR)$(bindir)/grog";
+ rm -f "$(DESTDIR)$(bindir)/grog"
for f in $(GROG_); do \
- -$(RM) "$(DESTDIR)$(grog_dir)/$$f"; \
- done;
- -test -d "$(DESTDIR)$(grog_dir)" || \
- -rmdir "$(DESTDIR)$(grog_dir)";
-
+ $(RM) "$(DESTDIR)$(grog_dir)/$$f"; \
+ done
+ -d="$(DESTDIR)$(grog_dir)";\
+ if test -d "$$d"; then rmdir "$$d"; fi
########################################################################
# Emacs settings
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 04/09: Fixes for `uninstall' target.,
Werner LEMBERG <=