Revision: 1736 http://geany.svn.sourceforge.net/geany/?rev=1736&view=rev Author: eht16 Date: 2007-07-24 02:24:14 -0700 (Tue, 24 Jul 2007)
Log Message: ----------- Fix make distcheck.
Modified Paths: -------------- trunk/ChangeLog trunk/Makefile.am trunk/doc/Makefile.am trunk/icons/Makefile.am trunk/plugins/Makefile.am trunk/scintilla/include/Makefile.am trunk/src/Makefile.am
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-23 16:06:07 UTC (rev 1735) +++ trunk/ChangeLog 2007-07-24 09:24:14 UTC (rev 1736) @@ -1,3 +1,10 @@ +2007-07-24 Enrico Tröger enrico.troeger@uvena.de + + * Makefile.am, doc/Makefile.am, icons/Makefile.am, plugins/Makefile.am, + scintilla/include/Makefile.am, src/Makefile.am: + Fix make distcheck. + + 2007-07-23 Nick Treleaven nick.treleaven@btinternet.com
* plugins/htmlchars.c, plugins/Makefile.am, src/interface.c,
Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2007-07-23 16:06:07 UTC (rev 1735) +++ trunk/Makefile.am 2007-07-24 09:24:14 UTC (rev 1736) @@ -29,7 +29,6 @@ HACKING \ README.I18N \ po/intl_stats.sh \ - po/LINGUAS \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ @@ -44,7 +43,8 @@
uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir); - rm $(DESTDIR)$(datadir)/pixmaps/geany.png; + rm -f $(DESTDIR)$(datadir)/pixmaps/geany.png; + rm -f $(DESTDIR)$(datadir)/pixmaps/geany.ico;
install-data-local: @$(NORMAL_INSTALL)
Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2007-07-23 16:06:07 UTC (rev 1735) +++ trunk/doc/Makefile.am 2007-07-24 09:24:14 UTC (rev 1736) @@ -10,7 +10,8 @@ mv doc/geany.pdf geany-$(VERSION).pdf
geany.txt: - jw -b txt $(srcdir)/doc/geany.docbook + echo $(srcdir) + jw -b txt $(srcdir)/geany.docbook
htmldoc: geany.docbook if [ geany.docbook -nt "./html/index.html" ]; then \
Modified: trunk/icons/Makefile.am =================================================================== --- trunk/icons/Makefile.am 2007-07-23 16:06:07 UTC (rev 1735) +++ trunk/icons/Makefile.am 2007-07-24 09:24:14 UTC (rev 1736) @@ -14,3 +14,6 @@ echo "***"; \ fi
+uninstall-local: + rm -f $(DESTDIR)$(datadir)/icons/hicolor/icon-theme.cache; +
Modified: trunk/plugins/Makefile.am =================================================================== --- trunk/plugins/Makefile.am 2007-07-23 16:06:07 UTC (rev 1735) +++ trunk/plugins/Makefile.am 2007-07-24 09:24:14 UTC (rev 1736) @@ -39,7 +39,7 @@
AM_CPPFLAGS = \ -DDATADIR="$(datadir)" \ - -I$(top_builddir)/src \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/tagmanager/include \ -I$(top_srcdir)/scintilla/include \ $(GTK_CFLAGS) \
Modified: trunk/scintilla/include/Makefile.am =================================================================== --- trunk/scintilla/include/Makefile.am 2007-07-23 16:06:07 UTC (rev 1735) +++ trunk/scintilla/include/Makefile.am 2007-07-24 09:24:14 UTC (rev 1736) @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in
-scintilla_INCLUDES = \ +noinst_HEADERS = \ Accessor.h \ KeyWords.h \ Platform.h \
Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2007-07-23 16:06:07 UTC (rev 1735) +++ trunk/src/Makefile.am 2007-07-24 09:24:14 UTC (rev 1736) @@ -37,6 +37,11 @@ ui_utils.c ui_utils.h \ utils.c utils.h
+# just to make "make distcheck" happy +noinst_HEADERS = \ + geany.h \ + support.h \ + plugindata.h
if MINGW # build Geany for Windows
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.