[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 05/09: `uninstall' target: Avoid spurious and misleading error m
|
From: |
Werner LEMBERG |
|
Subject: |
[groff] 05/09: `uninstall' target: Avoid spurious and misleading error messages. |
|
Date: |
Sun, 30 Mar 2014 20:13:35 +0000 |
wl pushed a commit to branch master
in repository groff.
commit 0187314661e043aa78bed59d2e09f1ff996d746e
Author: Steffen Nurpmeso <address@hidden>
Date: Sun Mar 30 09:20:49 2014 +0200
`uninstall' target: Avoid spurious and misleading error messages.
* Makefile.comm (uninstall_dev): Improve.
* font/devpdf/Makefile.sub (install_data): Remove superfluous `rm'.
(uninstall_sub): Improve.
* src/roff/groff/Makefile.sub (uninstall_sub): Fix.
* contrib/chem/Makefile.sub (uninstall_examples): Remove superfluous
`rmdir'.
---
ChangeLog | 11 +++++++++++
Makefile.comm | 21 +++++++++++----------
contrib/chem/ChangeLog | 4 ++++
contrib/chem/Makefile.sub | 1 -
font/devpdf/Makefile.sub | 21 ++++++++++-----------
src/roff/groff/Makefile.sub | 7 ++++---
6 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f0039e6..437dbe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2014-03-30 Steffen Nurpmeso <address@hidden>
+ `uninstall' target: Avoid spurious and misleading error messages.
+
+ * Makefile.comm (uninstall_dev): Improve.
+
+ * font/devpdf/Makefile.sub (install_data): Remove superfluous `rm'.
+ (uninstall_sub): Improve.
+
+ * src/roff/groff/Makefile.sub (uninstall_sub): Fix.
+
+2014-03-30 Steffen Nurpmeso <address@hidden>
+
Fixes for `uninstall' target.
* Makefile.in (uninstall_dirs): Use `DESTDIR'.
diff --git a/Makefile.comm b/Makefile.comm
index 5155f24..99089b4 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2002-2004, 2006-2011, 2013
+# Copyright (C) 1989-2000, 2002-2004, 2006-2011, 2013, 2014
# Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
#
@@ -298,16 +298,17 @@ uninstall_dev:
|| for f in ""$(OLDDEVFILES); do \
rm -f $(DESTDIR)$(oldfontsubdir)/$$f; \
done
- -test -d $(DESTDIR)$(fontsubdir)/generate \
- && rmdir $(DESTDIR)$(fontsubdir)/generate
- -test -d $(DESTDIR)$(fontsubdir)/enc \
- && rmdir $(DESTDIR)$(fontsubdir)/enc
- -test -d $(DESTDIR)$(fontsubdir)/map \
- && rmdir $(DESTDIR)$(fontsubdir)/map
- -test -d $(DESTDIR)$(fontsubdir)/util \
- && rmdir $(DESTDIR)$(fontsubdir)/util
+ -d="$(DESTDIR)$(fontsubdir)/generate";\
+ if test -d "$$d"; then rmdir "$$d"; fi
+ -d="$(DESTDIR)$(fontsubdir)/enc";\
+ if test -d "$$d"; then rmdir "$$d"; fi
+ -d="$(DESTDIR)$(fontsubdir)/map";\
+ if test -d "$$d"; then rmdir "$$d"; fi
+ -d="$(DESTDIR)$(fontsubdir)/util";\
+ if test -d "$$d"; then rmdir "$$d"; fi
-rmdir $(DESTDIR)$(fontsubdir)
- -rmdir $(DESTDIR)$(oldfontsubdir)
+ -d="$(DESTDIR)$(oldfontsubdir)";\
+ if test -d "$$d"; then rmdir "$$d"; fi
.PHONY: depend_src
depend_src: depend.temp
diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog
index 358659b..77359cc 100644
--- a/contrib/chem/ChangeLog
+++ b/contrib/chem/ChangeLog
@@ -1,5 +1,9 @@
2014-03-29 Steffen Nurpmeso <address@hidden>
+ * Makefile.sub (uninstall_examples): Remove superfluous `rmdir'.
+
+2014-03-29 Steffen Nurpmeso <address@hidden>
+
* Makefile.sub (install_examples): Use `find', not shell globs.
Instead of using rm(1) two times with shell globs the expansion of
diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub
index 28d1b86..0d2a4e6 100644
--- a/contrib/chem/Makefile.sub
+++ b/contrib/chem/Makefile.sub
@@ -103,7 +103,6 @@ uninstall_examples: uninstall_always
-rmdir $(DESTDIR)$(exampledir)/chem/122
$(RM) $(DESTDIR)$(exampledir)/chem/*
-rmdir $(DESTDIR)$(exampledir)/chem
- -rmdir $(DESTDIR)$(exampledir)
########################################################################
# Emacs settings
diff --git a/font/devpdf/Makefile.sub b/font/devpdf/Makefile.sub
index fa39346..3d5baa2 100644
--- a/font/devpdf/Makefile.sub
+++ b/font/devpdf/Makefile.sub
@@ -1,8 +1,8 @@
-# Copyright (C) 2011, 2013 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2013, 2014 Free Software Foundation, Inc.
# Free Software Foundation, Inc.
# Written by Deri James <address@hidden>
#
-# Last update: 15 Apr 2013
+# Last update: 30 Mar 2014
#
# This file is part of groff.
#
@@ -118,17 +118,16 @@ install_data:
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \
fi; \
done
- $(RM) $@
uninstall_sub:
for f in $(MOSTLYCLEANADD); do \
$(RM) $(DESTDIR)$(fontsubdir)/$$f; \
done
- -test -d $(DESTDIR)$(fontsubdir)/enc \
- && rmdir $(DESTDIR)$(fontsubdir)/enc
- -test -d $(DESTDIR)$(fontsubdir)/map \
- && rmdir $(DESTDIR)$(fontsubdir)/map
- -test -d $(DESTDIR)$(fontsubdir)/util \
- && rmdir $(DESTDIR)$(fontsubdir)/util
- -test -d $(DESTDIR)$(fontsubdir) \
- && rmdir $(DESTDIR)$(fontsubdir)
+ -d="$(DESTDIR)$(fontsubdir)/enc"; \
+ if test -d "$$d"; then rmdir "$$d"; fi
+ -d="$(DESTDIR)$(fontsubdir)/map"; \
+ if test -d "$$d"; then rmdir "$$d"; fi
+ -d="$(DESTDIR)$(fontsubdir)/util"; \
+ if test -d "$$d"; then rmdir "$$d"; fi
+ -d="$(DESTDIR)$(fontsubdir)"; \
+ if test -d "$$d"; then rmdir "$$d"; fi
diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
index 238d423..e43c3f6 100644
--- a/src/roff/groff/Makefile.sub
+++ b/src/roff/groff/Makefile.sub
@@ -73,9 +73,10 @@ uninstall_sub:
for f in $(GROFF_OPTS_OUTPUT); do \
$(RM) $(DESTDIR)$(libprogramdir)/$$f; \
done
- -test -d $(DESTDIR)$(libprogramdir) \
- && rmdir $(DESTDIR)$(libprogramdir)
-
+# XXX This will be removed by `uninstall_dirs' in `$(top_srcdir)/Makefile.in'
+# XXX (And only from there it is successful on an empty directory)
+# -d="$(DESTDIR)$(libprogramdir)";\
+# if test -d "$$d"; then rmdir "$$d"; fi
########################################################################
# Emacs settings
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 05/09: `uninstall' target: Avoid spurious and misleading error messages.,
Werner LEMBERG <=