Merge branch 'master' of github.com:slacka/WoeUSB

Makefile.am

@@ -1,9 +1,7 @@
-AUTOMAKE_OPTIONS = gnu
 
 SUBDIRS = src innoSetup debian
 
 # M4
-ACLOCAL_AMFLAGS = -I m4
 
 ## Pour fichier COPYING
 pkgdocdir=$(prefix)

README.md

@@ -4,6 +4,7 @@
 [![Build Status](https://travis-ci.org/slacka/WoeUSB.svg?branch=master)](https://travis-ci.org/slacka/WoeUSB)
 
 <img src="src/data/woeusb-logo.png" align="right" />
+
 _A Linux program to create Windows USB stick installer from a real Windows DVD or an image._
 
 This package contains two programs:
@@ -57,10 +58,14 @@ $ dpkg-buildpackage -uc -b # NOTE: Currently due to bug in the build system this
 $ sudo gdebi ../woeusb_<version>_<architecture>.deb
 
 # Generic method
+$ autoreconf --force --install # Most non-debian derived distros will need this
 $ ./configure
 $ make
 $ sudo make install
 ```
 
+# Distribution Packages
+[Arch Linux](https://aur.archlinux.org/packages/woeusb-git/)
+
 ## License
-WoeUSB is sold under the [GPL license](https://github.com/slacka/WoeUSB/blob/master/COPYING).
+WoeUSB is distributed under the [GPL license](https://github.com/slacka/WoeUSB/blob/master/COPYING).

configure.in

@@ -1,6 +1,6 @@
 AC_INIT(woeusb, @@WOEUSB_VERSION@@)
 AC_CONFIG_SRCDIR([src])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_MACRO_DIR([m4])
 
 MY_PACKAGE_INIT([WoeUSB])

src/locale/Makefile.am

@@ -1,4 +1,7 @@
 # Il faut mettre les fichiers dans le sous dossier locale de share...
-SUBDIRS = fr
+SUBDIRS = fr #zh_TW
 
 EXTRA_DIST = $(srcdir)/*.mo $(srcdir)/*.po
+
+all-local:
+	msgfmt default.po -o default.mo

src/locale/fr/LC_MESSAGES/Makefile.am

@@ -1,5 +1,8 @@
 # Il faut mettre les fichiers dans le sous dossier locale/fr/LC_MESSAGES de share...
 pkgdatadir=$(mypkgdatadir)/locale/fr/LC_MESSAGES
 
-dist_pkgdata_DATA = $(srcdir)/*.mo
 EXTRA_DIST = $(srcdir)/*.po
+
+all-local:
+	msgfmt trad.po -o trad.mo
+	msgfmt wxstd.po -o wxstd.mo