[PATCH] fcode-utils: add Makefile install target

[Mark Cave-Ayland]

Add an install target to the fcode-utils Makefiles for toke, detok and
romheaders so that "make install" will work correctly.

Signed-off-by: John Arbuckle 
Signed-off-by: Mark Cave-Ayland 
---
 fcode-utils-devel/detok/Makefile      |    4 ++++
 fcode-utils-devel/romheaders/Makefile |    9 ++++++++-
 fcode-utils-devel/toke/Makefile       |    4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/fcode-utils-devel/detok/Makefile b/fcode-utils-devel/detok/Makefile
index 0b730dc..3ba6c30 100644
--- a/fcode-utils-devel/detok/Makefile
+++ b/fcode-utils-devel/detok/Makefile
@@ -24,6 +24,7 @@

PROGRAM = detok

+DESTDIR = /usr/local
 CC      ?= gcc
 STRIP	= strip
 INCLUDES = -I../shared
@@ -63,3 +64,6 @@ clean:
 .c.o:
    $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@

+install:
+	mkdir -p $(DESTDIR)/bin
+	cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM)
diff --git a/fcode-utils-devel/romheaders/Makefile b/fcode-utils-devel/romheaders/Makefile
index 7d47a21..a216e7b 100644
--- a/fcode-utils-devel/romheaders/Makefile
+++ b/fcode-utils-devel/romheaders/Makefile
@@ -22,6 +22,9 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
 #

+PROGRAM = romheaders
+
+DESTDIR  = /usr/local
 CC	 ?= gcc
 STRIP    = strip
 CFLAGS   = -O2 -Wall -Wextra
@@ -39,4 +42,8 @@ romheaders: $(SOURCES)

clean:
    rm -f *~
-	rm -f romheaders
+	rm -f $(PROGRAM)
+
+install:
+	mkdir -p $(DESTDIR)/bin
+	cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM)
diff --git a/fcode-utils-devel/toke/Makefile b/fcode-utils-devel/toke/Makefile
index a3d81b1..aa75acd 100644
--- a/fcode-utils-devel/toke/Makefile
+++ b/fcode-utils-devel/toke/Makefile
@@ -24,6 +24,7 @@

PROGRAM = toke

+DESTDIR = /usr/local
 CC      ?= gcc
 STRIP	= strip
 INCLUDES = -I../shared
@@ -73,3 +74,6 @@ documentation:: *.c *.h toke.doxygen
 .c.o:
    $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@

+install:
+	mkdir -p $(DESTDIR)/bin
+	cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM)

[Andreas Färber]

Am 26.04.2015 um 20:14 schrieb Mark Cave-Ayland:
> Add an install target to the fcode-utils Makefiles for toke, detok and
> romheaders so that "make install" will work correctly.
>
> Signed-off-by: John Arbuckle 
> Signed-off-by: Mark Cave-Ayland
>
> fcode-utils-devel/detok/Makefile      |    4 ++++
>  fcode-utils-devel/romheaders/Makefile |    9 ++++++++-
>  fcode-utils-devel/toke/Makefile       |    4 ++++
>  3 files changed, 16 insertions(+), 1 deletion(-)

Reviewed-by: Andreas Färber

I trust that you've tested passing a different DESTDIR= from the command
line? I'm always unsure when =, ?=, :=, etc. are needed.

Regards,
Andreas

[Mark Cave-Ayland]

On 26/04/15 19:41, Andreas Färber wrote:
> Am 26.04.2015 um 20:14 schrieb Mark Cave-Ayland:
> > Add an install target to the fcode-utils Makefiles for toke, detok and
> > romheaders so that "make install" will work correctly.
> >
> > Signed-off-by: John Arbuckle 
> > Signed-off-by: Mark Cave-Ayland
> >
> > fcode-utils-devel/detok/Makefile      |    4 ++++
> >  fcode-utils-devel/romheaders/Makefile |    9 ++++++++-
> >  fcode-utils-devel/toke/Makefile       |    4 ++++
> >  3 files changed, 16 insertions(+), 1 deletion(-)
>
> Reviewed-by: Andreas Färber
>
> I trust that you've tested passing a different DESTDIR= from the command
> line? I'm always unsure when =, ?=, :=, etc. are needed.

Yes indeed, "make DESTDIR=/tmp install" works fine here. In that case
I'll add the R-B and get this committed.

ATB,

Mark.

[Programmingkid]

On Apr 26, 2015, at 2:14 PM, Mark Cave-Ayland wrote:
> Add an install target to the fcode-utils Makefiles for toke, detok and
> romheaders so that "make install" will work correctly.
>
> Signed-off-by: John Arbuckle 
> Signed-off-by: Mark Cave-Ayland
>
> fcode-utils-devel/detok/Makefile      |    4 ++++
> fcode-utils-devel/romheaders/Makefile |    9 ++++++++-
> fcode-utils-devel/toke/Makefile       |    4 ++++
> 3 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/fcode-utils-devel/detok/Makefile b/fcode-utils-devel/detok/Makefile
> index 0b730dc..3ba6c30 100644
> --- a/fcode-utils-devel/detok/Makefile
> +++ b/fcode-utils-devel/detok/Makefile
> @@ -24,6 +24,7 @@
>
> PROGRAM = detok
>
> +DESTDIR = /usr/local
> CC      ?= gcc
> STRIP	= strip
> INCLUDES = -I../shared
> @@ -63,3 +64,6 @@ clean:
> .c.o:
>    $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@
>
> +install:
> mkdir -p $(DESTDIR)/bin
> cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM)
>
> diff --git a/fcode-utils-devel/romheaders/Makefile b/fcode-utils-devel/romheaders/Makefile
> index 7d47a21..a216e7b 100644
> --- a/fcode-utils-devel/romheaders/Makefile
> +++ b/fcode-utils-devel/romheaders/Makefile
> @@ -22,6 +22,9 @@
> #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
> #
>
> +PROGRAM = romheaders
>
> +DESTDIR  = /usr/local
> CC	 ?= gcc
> STRIP    = strip
> CFLAGS   = -O2 -Wall -Wextra
> @@ -39,4 +42,8 @@ romheaders: $(SOURCES)
>
> clean:
>    rm -f *~
> rm -f romheaders
> rm -f $(PROGRAM)
>
> +install:
> mkdir -p $(DESTDIR)/bin
> cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM)
>
> diff --git a/fcode-utils-devel/toke/Makefile b/fcode-utils-devel/toke/Makefile
> index a3d81b1..aa75acd 100644
> --- a/fcode-utils-devel/toke/Makefile
> +++ b/fcode-utils-devel/toke/Makefile
> @@ -24,6 +24,7 @@
>
> PROGRAM = toke
>
> +DESTDIR = /usr/local
> CC      ?= gcc
> STRIP	= strip
> INCLUDES = -I../shared
> @@ -73,3 +74,6 @@ documentation:: *.c *.h toke.doxygen
> .c.o:
>    $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@
>
> +install:
> mkdir -p $(DESTDIR)/bin
> cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM)

Looks good.