foxygit / doom Log in
commit f6581c534ca2550fecacb457b791ff45e983be88
Author:     Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Sun Feb 26 14:18:20 2017 -0800
Commit:     Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Sun Feb 26 14:19:49 2017 -0800

    midiproc: Change name to @PROGRAM_PREFIX@midiproc in automake
---
 midiproc/Makefile.am  | 6 +++---
 pkg/win32/GNUmakefile | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/midiproc/Makefile.am b/midiproc/Makefile.am
index c2ca9124..3de865ef 100644
--- a/midiproc/Makefile.am
+++ b/midiproc/Makefile.am
@@ -3,9 +3,9 @@ AM_CFLAGS=-I$(top_srcdir)/src @SDLMIXER_CFLAGS@

 if HAVE_WINDRES

-noinst_PROGRAMS = midiproc
+noinst_PROGRAMS = @PROGRAM_PREFIX@midiproc

-midiproc_LDADD = @SDLMIXER_LIBS@
-midiproc_SOURCES = buffer.c buffer.h main.c
+@PROGRAM_PREFIX@midiproc_LDADD = @SDLMIXER_LIBS@
+@PROGRAM_PREFIX@midiproc_SOURCES = buffer.c buffer.h main.c

 endif
diff --git a/pkg/win32/GNUmakefile b/pkg/win32/GNUmakefile
index 0659469b..0d91d0c5 100644
--- a/pkg/win32/GNUmakefile
+++ b/pkg/win32/GNUmakefile
@@ -44,8 +44,8 @@ staging-%:
 	               $(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup.exe \
 	               $@/$(PROGRAM_PREFIX)$*-setup.exe
 	./cp-with-libs --ldflags="$(LDFLAGS)" \
-	               $(TOPLEVEL)/midiproc/midiproc.exe \
-	               $@/midiproc.exe
+	               $(TOPLEVEL)/midiproc/$(PROGRAM_PREFIX)midiproc.exe \
+	               $@/$(PROGRAM_PREFIX)midiproc.exe

 	$(STRIP) $@/*.exe $@/*.dll