Fixes for the root directory to get 'make dist' (not even distcheck)

diff --git a/Makefile.am b/Makefile.am
index 4ec12fa343313a00e9902f0900e5b07826ce3f85..2ee8aa85ce1ba5d583aa1cb0ccb60ec9afb7bed4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -153,23 +153,23 @@ 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/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/Italian.nsh   \
+       packaging/win32/languages/Japanese.nsh  \
+       packaging/win32/languages/Polish.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/header.bmp      \
        packaging/win32/header.svg      \
        packaging/win32/AdvUninstLog.nsh        \

diff --git a/README.osx b/README.osx
deleted file mode 100644 (file)
index 5013bbb..0000000
--- a/README.osx
+++ /dev/null
@@ -1,15 +0,0 @@
-Installation for Mac OS X users
-===============================
-
-We try to keep the Wiki pages on compiling Inkscape up-to-date and 
-comprehensive. It is here: 
-
-http://wiki.inkscape.org/wiki/index.php/CompilingMacOsX
-
-For a brief overview: 
-
-We suggest to use macports (http://macports.org) in order to achieve all
-the necessary components and libraries. Then there is a mighty tool called
-"osx-build.sh" in the packaging/macosx directory of the unpacked tarball.
-This script will do most of the work for you. 
-

diff --git a/README.osx.txt b/README.osx.txt
new file mode 100644 (file)
index 0000000..5013bbb
--- /dev/null
+++ b/README.osx.txt
@@ -0,0 +1,15 @@
+Installation for Mac OS X users
+===============================
+
+We try to keep the Wiki pages on compiling Inkscape up-to-date and 
+comprehensive. It is here: 
+
+http://wiki.inkscape.org/wiki/index.php/CompilingMacOsX
+
+For a brief overview: 
+
+We suggest to use macports (http://macports.org) in order to achieve all
+the necessary components and libraries. Then there is a mighty tool called
+"osx-build.sh" in the packaging/macosx directory of the unpacked tarball.
+This script will do most of the work for you. 
+