# HG changeset patch
# User jwe
# Date 1179851586 0
# Node ID 3390577e4e70685ae62893fccfa4e2a3a1b75cd1
# Parent  673686daec87488cc710364b6a85bce0cfdaf5d8
[project @ 2007-05-22 16:33:05 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-22  John W. Eaton  <jwe@octave.org>
+
+	* Makeconf.in (do-script-uninstall): Also remove directory.
+
 2007-05-22  Thomas Weber  <thomas.weber.mail@gmail.com>
 
 	* NEWS.2, README.MSVC, WWW/NEWS-2.html: Fix typos.
diff --git a/Makeconf.in b/Makeconf.in
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -638,4 +638,5 @@
   do rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \
 done
 rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD
+-rmdir $(addprefix $(DESTDIR), $(fcnfiledir)/$(script_sub_dir))
 endef
diff --git a/doc/ChangeLog b/doc/ChangeLog
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-22  John W. Eaton  <jwe@octave.org>
+
+	* interpreter/Makefile.in (TEXINFO_SOURCE): New variable.
+	(TEXINFO): Define using $(TEXINFO_SOURCE).
+	(DISTFILES): Include $(TEXINFO_SOURCE) in the list, not $(TEXINFO).
+
 2007-05-22  Thomas Weber  <thomas.weber.mail@gmail.com>
 
 	* faq/Octave-FAQ.texi, interpreter/basics.txi,
diff --git a/doc/interpreter/Makefile.in b/doc/interpreter/Makefile.in
--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -76,7 +76,10 @@
 
 SUB_TEXINFO := $(SUB_SOURCE:.txi=.texi)
 
-TEXINFO := $(MAIN_TEXINFO) $(SUB_TEXINFO) contributors.texi ../conf.texi
+# Don't list ../conf.texi here.
+TEXINFO_SOURCE := $(MAIN_TEXINFO) $(SUB_TEXINFO) contributors.texi
+
+TEXINFO := $(TEXINFO_SOURCE) ../conf.texi
 
 FORMATTED = octave.dvi octave.ps octave.pdf \
 	octave.info octave.info-[0-9]*
@@ -86,7 +89,7 @@
 
 # FIXME -- need to include generated figures here...
 DISTFILES = Makefile.in contributors.in mkcontrib.awk dir \
-  munge-texi.cc $(MAN_SRC) $(SOURCES) $(TEXINFO) $(FORMATTED) $(IMAGES)
+  munge-texi.cc $(MAN_SRC) $(SOURCES) $(TEXINFO_SOURCE) $(FORMATTED) $(IMAGES)
 
 DISTDIRS = HTML
 
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,10 @@
 
 	* version.h (OCTAVE_VERSION): Now 2.9.12.
 
+	* Makefile.in (uninstall): Also remove
+	$(DESTDIR)$(octincludedir)/octave, $(DESTDIR)$(octincludedir),
+	$(DESTDIR)$(octlibdir), and $(DESTDIR)$(octfiledir).
+
 2007-05-22  Thomas Weber  <thomas.weber.mail@gmail.com>
 
 	* debug.cc, error.cc, load-save.cc, oct-hist.cc, sighandlers.cc,
diff --git a/src/Makefile.in b/src/Makefile.in
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -470,6 +470,10 @@
 	  done; \
 	fi
 	rm -f $(DESTDIR)$(octfiledir)/PKG_ADD
+	-rmdir $(DESTDIR)$(octincludedir)/octave
+	-rmdir $(DESTDIR)$(octincludedir)
+	-rmdir $(DESTDIR)$(octlibdir)
+	-rmdir $(DESTDIR)$(octfiledir)
 .PHONY: uninstall
 
 tags: $(SOURCES) $(DLD_SRC)