X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=f9af841ad765b5ae09a7f25620ade726e71087d2;hb=42382dfb4164b919ffcdf03766da9f8be4e43b42;hp=e33d27150d68ab1f158cd30de196fa55251c00cd;hpb=8ec8d5d0c82b02919f1fbadee701997eb5d76e5e;p=inkscape.git

diff --git a/Makefile.am b/Makefile.am
index e33d27150..f9af841ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,9 +4,6 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = src doc share po
 
-appicondir = $(datadir)/pixmaps
-appicon_DATA = inkscape.png
-
 Graphicsdir = $(datadir)/applications
 Graphics_in_files = inkscape.desktop.in
 Graphics_DATA = $(Graphics_in_files:.desktop.in=.desktop)
@@ -19,6 +16,7 @@ Graphics_DATA = $(Graphics_in_files:.desktop.in=.desktop)
 ##	cp $(srcdir)/AUTHORS $(distdir)
 ##	cp $(srcdir)/NEWS $(distdir)
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
 man_MANS = inkscape.1 \
 		inkview.1
@@ -42,11 +40,11 @@ EXTRA_DIST = \
 	Info.plist.in	\
 	Info.plist		\
 	buildtool.cpp build.xml	\
-	README README.ca.txt README.de.txt README.es.txt README.fr.txt README.it.txt	\
-	HACKING.txt HACKING.de.txt HACKING.fr.txt HACKING.it.txt	\
+	README README.ca.txt README.de.txt README.es.txt README.fr.txt README.it.txt README.osx.txt README.pt_BR.txt README.sk.txt README.sr.txt	\
 	TRANSLATORS \
 	inkscape.png \
 	inkscape.ico \
+	mingwenv.bat \
 	src/helper/sp-marshal.cpp.mingw src/helper/sp-marshal.h.mingw \
 	src/2geom/angle.h \
 	src/inkscape-manifest.xml src/inkview-manifest.xml \
@@ -156,33 +154,61 @@ EXTRA_DIST = \
 	packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj \
 	packaging/win32/inkscape.nsi	\
 	packaging/win32/inkscape.nsi.uninstall	\
-	packaging/win32/breton.nsh	\
-	packaging/win32/catalan.nsh	\
-	packaging/win32/czech.nsh	\
-	packaging/win32/english.nsh	\
-	packaging/win32/finnish.nsh	\
-	packaging/win32/french.nsh	\
-	packaging/win32/galician.nsh	\
-	packaging/win32/german.nsh	\
-	packaging/win32/italian.nsh	\
-	packaging/win32/japanese.nsh	\
-	packaging/win32/polish.nsh	\
-	packaging/win32/russian.nsh	\
-	packaging/win32/slovak.nsh	\
-	packaging/win32/slovenian.nsh	\
-	packaging/win32/spanish.nsh	\
-	packaging/win32/simpchinese.nsh	\
-	packaging/win32/tradchinese.nsh	\
+	packaging/win32/languages/Breton.nsh	\
+	packaging/win32/languages/Catalan.nsh	\
+	packaging/win32/languages/Czech.nsh	\
+	packaging/win32/languages/Dutch.nsh	\
+	packaging/win32/languages/English.nsh	\
+	packaging/win32/languages/Finnish.nsh	\
+	packaging/win32/languages/French.nsh	\
+	packaging/win32/languages/Galician.nsh	\
+	packaging/win32/languages/German.nsh	\
+	packaging/win32/languages/Indonesian.nsh \
+	packaging/win32/languages/Italian.nsh	\
+	packaging/win32/languages/Japanese.nsh	\
+	packaging/win32/languages/Polish.nsh	\
+	packaging/win32/languages/Romanian.nsh	\
+	packaging/win32/languages/Russian.nsh	\
+	packaging/win32/languages/Slovak.nsh	\
+	packaging/win32/languages/Slovenian.nsh	\
+	packaging/win32/languages/Spanish.nsh	\
+	packaging/win32/languages/SimpChinese.nsh	\
+	packaging/win32/languages/TradChinese.nsh	\
+	packaging/win32/languages/Ukrainian.nsh	\
 	packaging/win32/header.bmp	\
 	packaging/win32/header.svg	\
 	packaging/win32/AdvUninstLog.nsh	\
 	packaging/win32/AdvUninstLog.txt	\
+	packaging/win32/ifexist.nsh \
 	packaging/win32/md5dll.dll	\
 	packaging/win32/md5dll.txt	\
 	packaging/win32/messagebox.dll	\
 	packaging/win32/MessageBox.txt	\
+	packaging/win32/RequireLatestNSIS.nsh \
+	packaging/win32/VersionCompleteXXXX.nsh \
 	packaging/win32/welcomefinish.bmp	\
 	packaging/win32/welcomefinish.svg	\
+	packaging/win32/portable/help.html \
+	packaging/win32/portable/readme.packaging.txt \
+	packaging/win32/portable/App/readme.txt \
+	packaging/win32/portable/App/AppInfo/appicon.ico \
+	packaging/win32/portable/App/AppInfo/appicon_16.png \
+	packaging/win32/portable/App/AppInfo/appicon_32.png \
+	packaging/win32/portable/App/AppInfo/appinfo.ini \
+	packaging/win32/portable/App/AppInfo/installer.ini \
+	packaging/win32/portable/Other/Help/images/donation_button.png \
+	packaging/win32/portable/Other/Help/images/favicon.ico \
+	packaging/win32/portable/Other/Help/images/help_background_footer.png \
+	packaging/win32/portable/Other/Help/images/help_background_header.png \
+	packaging/win32/portable/Other/Help/images/help_logo_top.png \
+	packaging/win32/portable/Other/Source/InkscapePortable.ini \
+	packaging/win32/portable/Other/Source/InkscapePortable.jpg \
+	packaging/win32/portable/Other/Source/InkscapePortable.nsi \
+	packaging/win32/portable/Other/Source/License.txt \
+	packaging/win32/portable/Other/Source/PortableApps.comInstallerCustom.nsh \
+	packaging/win32/portable/Other/Source/PortableApps.comLauncherLANG_ENGLISH.nsh \
+	packaging/win32/portable/Other/Source/Readme.txt \
+	packaging/win32/portable/Other/Source/ReplaceInFileWithTextReplace.nsh \
         po/inkscape.pot \
         po/update_po_files.sh \
 	src/inkscape.rc	src/inkview.rc
@@ -219,7 +245,7 @@ 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
 
-.PHONY: warn_markup
+#.PHONY: warn_markup
 noinst_DATA = warn_markup
 warn_markup:
 	@if perl $(srcdir)/po/check-markup $(srcdir)/po/*.po; [ $$? = 1 ]; then \