1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
|
Description: Adjustment of makefiles
This patch adjusts some makefiles for Debian's build style
Author: Roland Stigge <stigge@antcom.de>
Index: dia-0.97.3+git20160930/xmldocs.make
===================================================================
--- dia-0.97.3+git20160930.orig/xmldocs.make
+++ dia-0.97.3+git20160930/xmldocs.make
@@ -77,7 +77,7 @@ install-data-xml: omf
install-data-html: $(progname)_html
$(mkinstalldirs) $(DESTDIR)$(helpdocdir)
- cp -r $(srcdir)/$(progname)_html/* $(DESTDIR)$(helpdocdir)
+ cp -r $(progname)_html/* $(DESTDIR)$(helpdocdir)
uninstall-local-xml: uninstall-local-doc uninstall-local-omf
Index: dia-0.97.3+git20160930/hardcopies.make
===================================================================
--- dia-0.97.3+git20160930.orig/hardcopies.make
+++ dia-0.97.3+git20160930/hardcopies.make
@@ -77,19 +77,19 @@ clean-local: clean-local-xml \
endif
$(progname)_html: $(progname).xml $(xml_files) $(htmlstyle) $(pngfigures)
- $(mkinstalldirs) $(srcdir)/$(progname)_html
- $(mkinstalldirs) $(srcdir)/$(progname)_html/$(figdir)
- $(mkinstalldirs) $(srcdir)/$(progname)_html/images
- $(mkinstalldirs) $(srcdir)/$(progname)_html/images/callouts
- $(mkinstalldirs) $(srcdir)/$(progname)_html/css
- -cp ../html/images/*.png $(srcdir)/$(progname)_html/images
- -cp ../html/images/callouts/*.png \
- $(srcdir)/$(progname)_html/images/callouts
- -cp ../html/css/*.css $(srcdir)/$(progname)_html/css
- -cp $(srcdir)/$(figdir)/*.png $(srcdir)/$(progname)_html/$(figdir)
- cd $(srcdir)/$(progname)_html \
+ $(mkinstalldirs) $(progname)_html
+ $(mkinstalldirs) $(progname)_html/$(figdir)
+ $(mkinstalldirs) $(progname)_html/images
+ $(mkinstalldirs) $(progname)_html/images/callouts
+ $(mkinstalldirs) $(progname)_html/css
+ -cp $(srcdir)/../html/images/*.png $(progname)_html/images
+ -cp $(srcdir)/../html/images/callouts/*.png \
+ $(progname)_html/images/callouts
+ -cp $(srcdir)/../html/css/*.css $(progname)_html/css
+ -cp $(srcdir)/$(figdir)/*.png $(progname)_html/$(figdir)
+ cd $(progname)_html \
&& xsltproc --stringparam graphic.default.extension png \
- ../$(htmlstyle) ../$<
+ ../$(srcdir)/$(htmlstyle) ../$<
touch $(progname)_html
if WITH_PDFDOC
@@ -98,6 +98,7 @@ $(progname).pdf: $(progname).xml $(xml_f
-P 'latex.unicode.use=$(UNICODE)' \
-P latex.encoding='$(ENCODING)' \
$(LATEX_CLASS_OPTIONS) \
+ -o $@ \
$<
endif
@@ -146,7 +147,7 @@ endif
install-html: $(htmldoc)
$(mkinstalldirs) $(sysdoc_html)
- cp -r $(srcdir)/$(progname)_html/* $(sysdoc_html)
+ cp -r $(progname)_html/* $(sysdoc_html)
uninstall-html:
-rm -f $(sysdoc_html)/*.html
|