• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

作図ソフト dia の改良版


Commit MetaInfo

Revisionaaf8a46a9c25926584cb2a011200c8b169d14a20 (tree)
Zeit2002-05-31 05:28:10
AutorCyrille Chepelov <cyrille@src....>
CommiterCyrille Chepelov

Log Message

fixed a "make install" problem when db2html is not present (Reported by

* doc/pl/Makefile.am:
* doc/en/Makefile.am: fixed a "make install" problem when db2html
is not present (Reported by Andrew Ferrier
<andrew.junk@new-destiny.co.uk>). Fixed another "make distclean"
problem which prevented me from ever seeing the problem in doc/en...

* Makefile.am: added autogen.sh to the EXTRA_DIST clause.

Ändern Zusammenfassung

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
11 2002-05-30 Cyrille Chepelov <cyrille@chepelov.org>
22
3+ * doc/pl/Makefile.am:
4+ * doc/en/Makefile.am: fixed a "make install" problem when db2html
5+ is not present (Reported by Andrew Ferrier
6+ <andrew.junk@new-destiny.co.uk>). Fixed another "make distclean"
7+ problem which prevented me from ever seeing the problem in doc/en...
8+
9+ * Makefile.am: added autogen.sh to the EXTRA_DIST clause.
10+
311 * lib/font.c: patch from <robert.young@dsto.defence.gov.au>; add a
412 way to read the font path from the XFS configuration files in
513 order to enable FreeType (fixes #83098).
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_DIST = dia.xpm dia_gnome_icon.png dia_gnome_menu_icon.png \
4646 dia-diagram.png dia.mime dia.keys.in \
4747 core-translation-report po-checktrans.py po-checktrans \
4848 intltool-extract.in intltool-merge.in intltool-update.in \
49- RELEASE-PROCESS
49+ RELEASE-PROCESS autogen.sh
5050
5151
5252
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -40,14 +40,21 @@ stamp-doc:
4040 touch stamp-doc
4141 endif
4242
43+distclean-local:
44+ rm -f stamp-doc
45+ rm -rf $(srcdir)/dia-manual $(srcdir)/dia-manual.junk
46+
4347 # dist and install the html documentation ...
4448 dist-hook:
49+if HAVE_DB2HTML
4550 mkdir $(distdir)/dia-manual
4651 -cp $(srcdir)/dia-manual/*.html $(srcdir)/dia-manual/*.css $(distdir)/dia-manual
4752 mkdir $(distdir)/dia-manual/stylesheet-images
4853 -cp $(srcdir)/dia-manual/stylesheet-images/*.gif $(distdir)/dia-manual/stylesheet-images
54+endif
4955
5056 install-data-hook: stamp-doc
57+if HAVE_DB2HTML
5158 $(mkinstalldirs) $(DESTDIR)$(helpdir)
5259 for file in $(srcdir)/dia-manual/*.html $(srcdir)/dia-manual/*.css; do\
5360 $(INSTALL_DATA) $$file $(DESTDIR)$(helpdir)/`basename $$file`; \
@@ -60,6 +67,7 @@ install-data-hook: stamp-doc
6067 cd $(srcdir) && for file in $(GRAPHICS); do \
6168 $(INSTALL_DATA) $$file $(DESTDIR)$(helpdir)/graphics; \
6269 done
70+endif
6371
6472 uninstall-local:
6573 rm -rf $(DESTDIR)$(helpdir)
--- /dev/null
+++ b/doc/pl/.cvsignore
@@ -0,0 +1,6 @@
1+Makefile
2+Makefile.in
3+dia-manual
4+dia-manual.junk
5+stamp-doc
6+
--- a/doc/pl/Makefile.am
+++ b/doc/pl/Makefile.am
@@ -41,14 +41,21 @@ stamp-doc:
4141 touch stamp-doc
4242 endif
4343
44+distclean-local:
45+ rm -f stamp-doc
46+ rm -rf $(srcdir)/dia-manual $(srcdir)/dia-manual.junk
47+
4448 # dist and install the html documentation ...
4549 dist-hook:
50+if HAVE_DB2HTML
4651 mkdir $(distdir)/dia-manual
4752 -cp $(srcdir)/dia-manual/*.html $(srcdir)/dia-manual/*.css $(distdir)/dia-manual
4853 mkdir $(distdir)/dia-manual/stylesheet-images
4954 -cp $(srcdir)/dia-manual/stylesheet-images/*.gif $(distdir)/dia-manual/stylesheet-images
55+endif
5056
5157 install-data-hook: stamp-doc
58+if HAVE_DB2HTML
5259 $(mkinstalldirs) $(DESTDIR)$(helpdir)
5360 for file in $(srcdir)/dia-manual/*.html $(srcdir)/dia-manual/*.css; do\
5461 $(INSTALL_DATA) $$file $(DESTDIR)$(helpdir)/`basename $$file`; \
@@ -61,6 +68,7 @@ install-data-hook: stamp-doc
6168 cd $(srcdir) && for file in $(GRAPHICS); do \
6269 $(INSTALL_DATA) $$file $(DESTDIR)$(helpdir)/graphics; \
6370 done
71+endif
6472
6573 uninstall-local:
6674 rm -rf $(DESTDIR)$(helpdir)