Make use of @datadir@ and @mandir@ in doc/Makefile.in for specifying where

documentation should be installed. Patch from Marcus Rueckert. The prefix
variable should be lowercase in makefiles, since @datadir@ and @mandir@ expect
this. Added names to the CREDITS file.

git-svn-id: http://svn.complang.org/ragel/trunk@120 052ea7fc-9027-0410-9066-f65837a77df0

diff --git a/CREDITS b/CREDITS
index 0d94661..ad999f3 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -25,4 +25,4 @@ have been missed.
     Drai, Matthias Rahlf, Zinx Verituse, Markus W. Weissmann, Marc Liyanage,
     Erich Ocean, Alan West, Steven Kibbler, Laurent Boulard, Jon Oberheide,
     David Helder, Lexington Luthor, Jason Jobe, Colin Fleming, Carlos Antunes,
-    Steve Horne, Matt Mower, Josef Goettgens
+    Steve Horne, Matt Mower, Josef Goettgens, Zed Shaw, Marcus Rueckert

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6ef0d57..f1505df 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -27,8 +27,10 @@ PDFFIGS = $(FIGURES:%.fig=%.pdf)
 # Get the version info.
 include ../version.mk
 
-# Install prefix.
-PREFIX = @prefix@
+# Installation locations.
+prefix = @prefix@
+docdir = @datadir@/doc/ragel
+mandir = @mandir@
 
 # Rules.
 all: ragel-guide.pdf ragel.1 rlgen-cd.1 rlgen-java.1 rlgen-ruby.1 rlgen-dot.1
@@ -63,14 +65,14 @@ distclean: clean
        rm -f Makefile
        
 install: all
-       install -d $(PREFIX)/man/man1
-       install -m 644 ragel.1 $(PREFIX)/man/man1/ragel.1
-       install -m 644 rlgen-dot.1 $(PREFIX)/man/man1/rlgen-dot.1
-       install -m 644 rlgen-cd.1 $(PREFIX)/man/man1/rlgen-cd.1
-       install -m 644 rlgen-java.1 $(PREFIX)/man/man1/rlgen-java.1
-       install -m 644 rlgen-ruby.1 $(PREFIX)/man/man1/rlgen-ruby.1
-       install -d $(PREFIX)/share/doc/ragel
-       install -m 644 ragel-guide.pdf $(PREFIX)/share/doc/ragel/ragel-guide.pdf
+       install -d $(mandir)/man1
+       install -m 644 ragel.1      $(mandir)/man1/ragel.1
+       install -m 644 rlgen-dot.1  $(mandir)/man1/rlgen-dot.1
+       install -m 644 rlgen-cd.1   $(mandir)/man1/rlgen-cd.1
+       install -m 644 rlgen-java.1 $(mandir)/man1/rlgen-java.1
+       install -m 644 rlgen-ruby.1 $(mandir)/man1/rlgen-ruby.1
+       install -d $(docdir)
+       install -m 644 ragel-guide.pdf $(docdir)/ragel-guide.pdf
        gzip -c ../ChangeLog > ChangeLog.gz
-       install -m 644 ChangeLog.gz $(PREFIX)/share/doc/ragel/ChangeLog.gz
+       install -m 644 ChangeLog.gz $(docdir)/ChangeLog.gz
        rm ChangeLog.gz

diff --git a/ragel/Makefile.in b/ragel/Makefile.in
index 5a96b98..dd88190 100644 (file)
--- a/ragel/Makefile.in
+++ b/ragel/Makefile.in
@@ -35,7 +35,7 @@ LIBS = ../common/common.a
 
 #*************************************
 
-PREFIX = @prefix@
+prefix = @prefix@
 
 BUILD_PARSERS = @BUILD_PARSERS@
 
@@ -80,7 +80,7 @@ clean:
        rm -f tags .*.d *.o ragel $(EXTRA_CLEAN)
 
 install: all
-       install -d $(PREFIX)/bin
-       install -s ragel $(PREFIX)/bin/ragel
+       install -d $(prefix)/bin
+       install -s ragel $(prefix)/bin/ragel
 
 -include $(DEPS)

diff --git a/rlgen-cd/Makefile.in b/rlgen-cd/Makefile.in
index c3eaa61..1aaef72 100644 (file)
--- a/rlgen-cd/Makefile.in
+++ b/rlgen-cd/Makefile.in
@@ -33,7 +33,7 @@ GEN_SRC = xmltags.cpp xmlscan.cpp xmlparse.cpp xmlparse.h
 
 LIBS = ../common/common.a ../redfsm/redfsm.a
 
-PREFIX += @prefix@
+prefix = @prefix@
 
 #*************************************
 
@@ -64,7 +64,7 @@ clean:
        rm -f tags .*.d *.o rlgen-cd $(EXTRA_CLEAN)
 
 install: all
-       install -d $(PREFIX)/bin
-       install -s rlgen-cd $(PREFIX)/bin/rlgen-cd
+       install -d $(prefix)/bin
+       install -s rlgen-cd $(prefix)/bin/rlgen-cd
 
 -include $(DEPS)

diff --git a/rlgen-dot/Makefile.in b/rlgen-dot/Makefile.in
index b79a2a5..a216887 100644 (file)
--- a/rlgen-dot/Makefile.in
+++ b/rlgen-dot/Makefile.in
@@ -28,7 +28,7 @@ CC_SRCS = main.cpp gvdotgen.cpp
 
 LIBS = ../common/common.a ../redfsm/redfsm.a
 
-PREFIX += @prefix@
+prefix = @prefix@
 
 #*************************************
 
@@ -59,7 +59,7 @@ clean:
        rm -f tags .*.d *.o rlgen-dot $(EXTRA_CLEAN)
 
 install: all
-       install -d $(PREFIX)/bin
-       install -s rlgen-dot $(PREFIX)/bin/rlgen-dot
+       install -d $(prefix)/bin
+       install -s rlgen-dot $(prefix)/bin/rlgen-dot
 
 -include $(DEPS)

diff --git a/rlgen-java/Makefile.in b/rlgen-java/Makefile.in
index 06e9834..4bc5970 100644 (file)
--- a/rlgen-java/Makefile.in
+++ b/rlgen-java/Makefile.in
@@ -29,7 +29,7 @@ CC_SRCS = main.cpp javacodegen.cpp
 LIBS = ../common/common.a ../redfsm/redfsm.a
 
 LIBS += @LIBS@
-PREFIX += @prefix@
+prefix = @prefix@
 
 #*************************************
 
@@ -60,7 +60,7 @@ clean:
        rm -f tags .*.d *.o rlgen-java
 
 install: all
-       install -d $(PREFIX)/bin
-       install -s rlgen-java $(PREFIX)/bin/rlgen-java
+       install -d $(prefix)/bin
+       install -s rlgen-java $(prefix)/bin/rlgen-java
 
 -include $(DEPS)

diff --git a/rlgen-ruby/Makefile.in b/rlgen-ruby/Makefile.in
index 3b994a0..b69b473 100644 (file)
--- a/rlgen-ruby/Makefile.in
+++ b/rlgen-ruby/Makefile.in
@@ -29,7 +29,7 @@ CC_SRCS = main.cpp rubycodegen.cpp
 LIBS = ../common/common.a ../redfsm/redfsm.a
 
 LIBS += @LIBS@
-PREFIX += @prefix@
+prefix = @prefix@
 
 #*************************************
 
@@ -60,7 +60,7 @@ clean:
        rm -f tags .*.d *.o rlgen-ruby
 
 install: all
-       install -d $(PREFIX)/bin
-       install -s rlgen-ruby $(PREFIX)/bin/rlgen-ruby
+       install -d $(prefix)/bin
+       install -s rlgen-ruby $(prefix)/bin/rlgen-ruby
 
 -include $(DEPS)