mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Always install/uninstall manpages when installing/uninstalling gnustep-make, and fixed uninstall of gnustep-make to remove some files that were otherwise left there
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@25752 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
30f0891a32
commit
62805a46e1
3 changed files with 28 additions and 38 deletions
14
ChangeLog
14
ChangeLog
|
|
@ -1,3 +1,17 @@
|
|||
2007-12-17 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* GNUmakefile.in (uninstall): Remove filesystem.make
|
||||
and GNUstep.conf.
|
||||
|
||||
2007-12-17 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* GNUmakefile.in (install): Always install the manpages included
|
||||
in the Documentation directory; they don't need building.
|
||||
(uninstall): Uninstall them.
|
||||
* Documentation/GNUmakefile (after-install): Do not install
|
||||
the manpages.
|
||||
(after-uninstall): Do not uninstall them.
|
||||
|
||||
2007-12-15 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Rewritten config-precomp-test to work when the build directory is
|
||||
|
|
|
|||
|
|
@ -141,9 +141,7 @@ ANNOUNCE_TEXI_FILES = version.texi
|
|||
ANNOUNCE_TEXT_MAIN = announce.texi
|
||||
ANNOUNCE_DOC_INSTALL_DIR = Developer/Make/ReleaseNotes/$(GNUSTEP_MAKE_VERSION)
|
||||
|
||||
# Manual pages to install
|
||||
MAN1_PAGES = openapp.1
|
||||
MAN7_PAGES = GNUstep.7
|
||||
# The manpages are now installed when gnustep-make itself is installed.
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/documentation.make
|
||||
|
||||
|
|
@ -162,49 +160,15 @@ version.texi: ../Version
|
|||
echo '@set GNUSTEP-MAKE-VERSION' $(GNUSTEP_MAKE_VERSION) \
|
||||
> version.texi
|
||||
|
||||
# Install manually man pages
|
||||
after-install:: $(GNUSTEP_DOC)/Developer/Make/Manual $(GNUSTEP_DOC)/User/GNUstep
|
||||
$(INSTALL_DATA) DESIGN $(GNUSTEP_DOC)/Developer/Make/Manual
|
||||
for file in $(README_FILES); do \
|
||||
$(INSTALL_DATA) $$file $(GNUSTEP_DOC)/User/GNUstep/$$file; \
|
||||
done;
|
||||
if [ ! -f $(GNUSTEP_DOC_MAN) ]; then \
|
||||
$(MKDIRS) $(GNUSTEP_DOC_MAN); \
|
||||
fi; \
|
||||
if [ ! -f $(GNUSTEP_DOC_MAN)/man1 ]; then \
|
||||
$(MKDIRS) $(GNUSTEP_DOC_MAN)/man1; \
|
||||
fi; \
|
||||
for file in $(MAN1_PAGES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) $$file $(GNUSTEP_DOC_MAN)/man1/$$file; \
|
||||
which gzip && rm -f $(GNUSTEP_DOC_MAN)/man1/$$file.gz \
|
||||
&& gzip -9 $(GNUSTEP_DOC_MAN)/man1/$$file; \
|
||||
fi; \
|
||||
done;
|
||||
if [ ! -f $(GNUSTEP_DOC_MAN)/man7 ]; then \
|
||||
$(MKDIRS) $(GNUSTEP_DOC_MAN)/man7; \
|
||||
fi; \
|
||||
for file in $(MAN7_PAGES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
$(INSTALL_DATA) $$file $(GNUSTEP_DOC_MAN)/man7/$$file; \
|
||||
which gzip && rm -f $(GNUSTEP_DOC_MAN)/man7/$$file.gz \
|
||||
&& gzip -9 $(GNUSTEP_DOC_MAN)/man7/$$file; \
|
||||
fi; \
|
||||
done;
|
||||
done
|
||||
|
||||
# Uninstall manually man pages
|
||||
after-uninstall::
|
||||
rm -f $(GNUSTEP_DOC)/Developer/Make/Manual/DESIGN
|
||||
for file in $(MAN1_PAGES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
rm -f $(GNUSTEP_DOC_MAN)/man1/$$file; \
|
||||
fi; \
|
||||
done;
|
||||
for file in $(MAN7_PAGES) __done; do \
|
||||
if [ $$file != __done ]; then \
|
||||
rm -f $(GNUSTEP_DOC_MAN)/man7/$$file; \
|
||||
fi; \
|
||||
done;
|
||||
|
||||
after-distclean::
|
||||
rm -f version.texi
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ override GNUSTEP_CONFIG_FILE = $(DESTDIR)@GNUSTEP_CONFIG_FILE@
|
|||
override GNUSTEP_CONFIG_FILE_DIR = $(dir $(GNUSTEP_CONFIG_FILE))
|
||||
tooldir = $(DESTDIR)@GNUSTEP_SYSTEM_TOOLS@
|
||||
makedir = $(DESTDIR)@GNUSTEP_MAKEFILES@
|
||||
mandir = $(DESTDIR)@GNUSTEP_SYSTEM_DOC_MAN@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
|
|
@ -179,6 +180,13 @@ install: generated-files
|
|||
$(INSTALL_DATA) config-noarch.make $(makedir); \
|
||||
$(INSTALL_DATA) filesystem.make $(makedir); \
|
||||
$(INSTALL_DATA) config.make $(makedir)/$(GNUSTEP_TARGET_LDIR))
|
||||
$(EC)(echo "Installing manpages"; \
|
||||
$(srcdir)/mkinstalldirs $(mandir)/man1 \
|
||||
$(mandir)/man7; \
|
||||
$(INSTALL_DATA) $(srcdir)/Documentation/openapp.1 $(mandir)/man1; \
|
||||
which gzip > /dev/null 2>&1 && rm -f $(mandir)/man1/openapp.1.gz && gzip -9 $(mandir)/man1/openapp.1; \
|
||||
$(INSTALL_DATA) $(srcdir)/Documentation/GNUstep.7 $(mandir)/man7; \
|
||||
which gzip > /dev/null 2>&1 && rm -f $(mandir)/man7/GNUstep.7.gz && gzip -9 $(mandir)/man7/GNUstep.7)
|
||||
$(EC)(if [ "@GNUSTEP_STRIP_MAKEFILES@" = "strip" ]; then \
|
||||
echo "Stripping makefiles and shell scripts..."; \
|
||||
cd $(makedir); ./strip_makefiles.sh; \
|
||||
|
|
@ -189,6 +197,8 @@ install: generated-files
|
|||
# $(INSTALL_DATA) $(srcdir)/config.site $(GNUSTEP_SYSTEM_ROOT)/share)
|
||||
|
||||
uninstall:
|
||||
rm -f $(mandir)/man1/openapp.1 $(mandir)/man1/openapp.1.gz; \
|
||||
rm -f $(mandir)/man7/GNUstep.7 $(mandir)/man7/GNUstep.7.gz; \
|
||||
for f in config.guess config.sub install-sh mkinstalldirs \
|
||||
clean_cpu.sh clean_os.sh \
|
||||
clean_vendor.sh cpu.sh ld_lib_path.sh os.sh \
|
||||
|
|
@ -223,7 +233,9 @@ uninstall:
|
|||
rm -f $(makedir)/app-wrapper.template
|
||||
rm -f $(GNUSTEP_SYSTEM_ROOT)/share/config.site
|
||||
rm -f $(makedir)/config-noarch.make
|
||||
rm -f $(makedir)/filesystem.make
|
||||
rm -f $(makedir)/$(GNUSTEP_TARGET_LDIR)/config.make
|
||||
rm -f "$(GNUSTEP_CONFIG_FILE)"
|
||||
-for f in $(makedir)/Instance/Documentation \
|
||||
$(makedir)/Instance/Shared \
|
||||
$(makedir)/Instance \
|
||||
|
|
|
|||
Loading…
Reference in a new issue