Fix #2797485 After doing a 'make clean', install fails if yodl2man or yodl2html is not available.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11602 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2009-08-17 01:10:04 +00:00
commit cd6eb83d61
3 changed files with 10 additions and 3 deletions

View file

@ -53,7 +53,7 @@ uninstall: $(PACKAGE_NAME)$(EXEEXT) $(PACKAGE_NAME).1
clean: clean:
/bin/rm -f $(OBJS) *~ $(PACKAGE_NAME)$(EXEEXT) /bin/rm -f $(OBJS) *~ $(PACKAGE_NAME)$(EXEEXT)
clean-docs: distclean-docs:
rm -f $(PACKAGE_NAME).1 web/ccache-man.html rm -f $(PACKAGE_NAME).1 web/ccache-man.html
check : test check : test
@ -63,7 +63,7 @@ test: test.sh
check: test check: test
distclean: clean distclean: clean distclean-docs
/bin/rm -f Makefile config.h config.sub config.log build-stamp config.status configure config.h /bin/rm -f Makefile config.h config.sub config.log build-stamp config.status configure config.h
# FIXME: To fix this, test.sh needs to be able to take ccache from the # FIXME: To fix this, test.sh needs to be able to take ccache from the

View file

@ -1,6 +1,10 @@
Version 1.3.40 (in progress) Version 1.3.40 (in progress)
============================ ============================
2009-08-17: wsfulton
Fix #2797485 After doing a 'make clean', install fails if yodl2man or yodl2html
is not available.
2009-08-16: wsfulton 2009-08-16: wsfulton
[Octave] Caught exceptions display the type of the C++ exception instead of the [Octave] Caught exceptions display the type of the C++ exception instead of the
generic "c++-side threw an exception" message. generic "c++-side threw an exception" message.

View file

@ -377,7 +377,7 @@ clean-docs-main:
@test -d $(DOCS) || exit 0; cd $(DOCS) && $(MAKE) clean @test -d $(DOCS) || exit 0; cd $(DOCS) && $(MAKE) clean
clean-docs-ccache: clean-docs-ccache:
@test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) clean-docs) @# Use distclean-docs-ccache, else a user requires the yodl tools to generate the docs after a clean
maintainer-clean: clean-libfiles maintainer-clean: clean-libfiles
@cd $(SOURCE) && $(MAKE) maintainer-clean @cd $(SOURCE) && $(MAKE) maintainer-clean
@ -404,6 +404,9 @@ distclean-test-suite:
distclean-ccache: distclean-ccache:
test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s distclean) test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s distclean)
distclean-docs-ccache:
@test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) distclean-docs)
distclean-dead: distclean-dead:
rm -f $(DISTCLEAN-DEAD) rm -f $(DISTCLEAN-DEAD)