restored pedro/work and added it to make.exclude

[inkscape.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0cee8933be9345ac4eec89fbb1d3611bfc38d42e..a33ea0e53f39f7f1e19da7f10082d2ff8b93efb4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,6 +112,7 @@ EXTRA_DIST = \
        packaging/macosx/Resources/ProgressWindow.nib/objects.xib       \
        packaging/macosx/Resources/bin/getdisplay.sh    \
        packaging/macosx/Resources/bin/inkscape \
+       packaging/macosx/Resources/etc/fonts/fonts.conf \
        packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib  \
        packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib     \
        packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib  \
@@ -126,17 +127,21 @@ EXTRA_DIST = \
        packaging/macosx/ScriptExec/MenuBar.nib/info.nib        \
        packaging/macosx/ScriptExec/MenuBar.nib/objects.xib     \
        packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj    \
-       packaging/macosx/ScriptExec/ScriptExec.xcode/sveinbjornt.pbxuser        \
-       packaging/macosx/ScriptExec/ScriptExec.xcode/voisine.pbxuser    \
+       packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj \
        packaging/win32/inkscape.nsi    \
        packaging/win32/inkscape.nsi.uninstall  \
+       packaging/win32/catalan.nsh     \
        packaging/win32/czech.nsh       \
        packaging/win32/english.nsh     \
+       packaging/win32/french.nsh      \
        packaging/win32/italian.nsh     \
+       packaging/win32/polish.nsh      \
        packaging/win32/german.nsh      \
+       packaging/win32/spanish.nsh     \
        packaging/win32/header.bmp      \
        po/Makefile.mingw \
         po/inkscape.pot \
+        po/update_po_files.sh \
        src/Makefile.mingw src/inkscape_version.h.mingw src/inkscape.rc src/makedef.pl \
        src/helper/sp-marshal.h.mingw src/helper/sp-marshal.cpp.mingw
 
@@ -167,9 +172,12 @@ inkscape.1 inkscape.fr.1: fix-roff-punct Makefile.am AUTHORS utf8-to-roff
          | perl $(srcdir)/fix-roff-punct \
          | perl -CI $(srcdir)/utf8-to-roff     \
          > tmp.$$$$ \
-        && mv tmp.$$$$ $@
+        && mv -f tmp.$$$$ $@
 # man 7 groff_char for further remarks on charset encoding for man pages.
 
+po/inkscape.pot:
+       (cd po ; intltool-update --pot)
+
 install-data-local: inkscape.fr.1
        $(mkinstalldirs) $(DESTDIR)$(mandir)/fr/man1
        $(INSTALL_DATA) `if [ -f inkscape.fr.1 ]; then :; else echo $(srcdir)/;fi`inkscape.fr.1 $(DESTDIR)$(mandir)/fr/man1/inkscape.1