diff options
| author | Hugh McMaster <hugh.mcmaster@outlook.com> | 2020-05-17 16:49:31 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-17 08:49:31 +0200 |
| commit | 89ed031101d2b37458ae0ce541131d66bbfa5cc2 (patch) | |
| tree | f2670db1368ebc8856a1df3558b455e71d214c1e | |
| parent | 8f5222e9484f849ee256fe3ada50bb9cabac0c05 (diff) | |
| download | libexif-89ed031101d2b37458ae0ce541131d66bbfa5cc2.tar.gz libexif-89ed031101d2b37458ae0ce541131d66bbfa5cc2.tar.bz2 libexif-89ed031101d2b37458ae0ce541131d66bbfa5cc2.zip | |
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
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | README-Win32.txt | 4 | ||||
| -rw-r--r-- | binary-dist/.gitignore (renamed from binary/.gitignore) | 0 | ||||
| -rw-r--r-- | binary-dist/Makefile.am (renamed from binary/Makefile.am) | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 146a7e1..f999a7f 100644 --- 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 --- 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 index 282522d..282522d 100644 --- a/binary/.gitignore +++ b/binary-dist/.gitignore diff --git a/binary/Makefile.am b/binary-dist/Makefile.am index 067716b..75e644b 100644 --- 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 --- 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 ]) |