Rename 'binary' directory to 'binary-dist' (#43)

* Rename 'binary' directory to 'binary-dist'

Debian invokes a 'binary' target in its build process. The presence of
the 'binary' directory breaks the automated build, as 'make' thinks the
target has already been invoked.

* Use substitution variable for 'mkdir -p' instead of hard-coding the command

diff --git a/Makefile.am b/Makefile.am
index 146a7e1..f999a7f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = m4m po libexif test doc binary contrib
+SUBDIRS = m4m po libexif test doc binary-dist contrib
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec README-Win32.txt
 

diff --git a/README-Win32.txt b/README-Win32.txt
index 45a16af..58ff1a1 100644 (file)
--- a/README-Win32.txt
+++ b/README-Win32.txt
@@ -1,7 +1,7 @@
 If this is a combined source/binary distribution tree, then you can find
 
-   * the binary DLL     in the subdirectory  binary/bin/
-   * the include files  in the subdirectory  binary/include/
+   * the binary DLL     in the subdirectory  binary-dist/bin/
+   * the include files  in the subdirectory  binary-dist/include/
 
 As for building libexif yourself on or for Win32, you can
 

diff --git a/binary/.gitignore b/binary-dist/.gitignore
similarity index 100%
rename from binary/.gitignore
rename to binary-dist/.gitignore

diff --git a/binary/Makefile.am b/binary-dist/Makefile.am
similarity index 91%
rename from binary/Makefile.am
rename to binary-dist/Makefile.am
index 067716b..75e644b 100644 (file)
--- a/binary/Makefile.am
+++ b/binary-dist/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = include bin
 SH_DIST_HOOK = dist-ship-binary-hook
 dist-ship-binary-hook include bin:
        cd "$(top_builddir)" && $(MAKE) includedir="$(PWD)/include" DESTDIR="" prefix="$(PWD)/tmp" install
-       mkdir -p "$(PWD)/bin"
+       $(MKDIR_P) "$(PWD)/bin"
        cp "$(PWD)/tmp/bin/"*.dll "bin/"
 
 endif

diff --git a/configure.ac b/configure.ac
index f39b4f3..b0a5881 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -215,7 +215,7 @@ AC_CONFIG_FILES([  po/Makefile.in
   doc/Doxyfile-internals
   libexif.pc
   libexif-uninstalled.pc
-  binary/Makefile
+  binary-dist/Makefile
   contrib/Makefile
   contrib/examples/Makefile
 ])