diff -ur routino-1.5.1/doc/Makefile routino-1.5.1-makefiles/doc/Makefile --- routino-1.5.1/doc/Makefile 2010-09-05 20:27:07.000000000 +0200 +++ routino-1.5.1-makefiles/doc/Makefile 2011-04-25 19:57:04.000000000 +0200 @@ -26,8 +26,8 @@ # Files to install -HTML_FILES=html/* -TXT_FILES=*.txt +HTML_FILES=html/*.html html/*.png html/style.css +TXT_FILES=*.txt ../ChangeLog ../agpl-3.0.txt ######## @@ -35,8 +35,8 @@ -@[ -d $(WEBDIR) ] && \ for file in $(HTML_FILES); do \ if [ ! -f $(WEBDIR)/`basename $$file` ] || [ $$file -nt $(WEBDIR)/`basename $$file` ]; then \ - echo cp $$file $(WEBDIR) ;\ - cp -f $$file $(WEBDIR) ;\ + echo cp -pf $$file $(WEBDIR) ;\ + cp -pf $$file $(WEBDIR) ;\ fi ;\ done @@ -46,14 +46,14 @@ -[ -d $(DESTDIR)$(docdir) ] || mkdir -p $(DESTDIR)$(docdir) @[ -d $(DESTDIR)$(docdir) ] && \ for file in $(TXT_FILES); do \ - echo cp $$file $(DESTDIR)$(docdir) ;\ - cp -f $$file $(DESTDIR)$(docdir) ;\ + echo cp -pf $$file $(DESTDIR)$(docdir) ;\ + cp -pf $$file $(DESTDIR)$(docdir) ;\ done -[ -d $(DESTDIR)$(docdir)/html ] || mkdir -p $(DESTDIR)$(docdir)/html @[ -d $(DESTDIR)$(docdir)/html ] && \ for file in $(HTML_FILES); do \ - echo cp $$file $(DESTDIR)$(docdir)/html ;\ - cp -f $$file $(DESTDIR)$(docdir)/html ;\ + echo cp -pf $$file $(DESTDIR)$(docdir)/html ;\ + cp -pf $$file $(DESTDIR)$(docdir)/html ;\ done ######## diff -ur routino-1.5.1/Makefile routino-1.5.1-makefiles/Makefile --- routino-1.5.1/Makefile 2010-09-05 20:26:57.000000000 +0200 +++ routino-1.5.1-makefiles/Makefile 2011-04-23 19:14:06.000000000 +0200 @@ -22,9 +22,9 @@ # Installation locations -prefix=/usr/local +prefix=/usr bindir=$(prefix)/bin -docdir=$(prefix)/doc/routino +docdir=$(prefix)/share/doc/routino datadir=$(prefix)/share/routino # Sub-directories and sub-makefiles diff -ur routino-1.5.1/src/Makefile routino-1.5.1-makefiles/src/Makefile --- routino-1.5.1/src/Makefile 2010-11-13 15:22:28.000000000 +0100 +++ routino-1.5.1-makefiles/src/Makefile 2011-04-25 17:34:58.000000000 +0200 @@ -33,18 +33,8 @@ # Compilation program options -CFLAGS=-Wall -Wmissing-prototypes -#CFLAGS+= -Wextra -pedantic -std=c99 -LDFLAGS=-lm -lc - -CFLAGS+= -O3 -#CFLAGS+= -O0 -g -#CFLAGS+= -pg -#CFLAGS+= --coverage - -LDFLAGS+= -#LDFLAGS+= -pg -static -#LDFLAGS+= --coverage +CFLAGS+=-Wall -Wmissing-prototypes +LDFLAGS+=-lm -lc LEXFLAGS= @@ -65,8 +55,8 @@ -@[ -d $(WEBDIR) ] && \ for file in $(EXE); do \ if [ ! -f $(WEBDIR)/$$file ] || [ $$file -nt $(WEBDIR)/$$file ]; then \ - echo cp $$file $(WEBDIR) ;\ - cp -f $$file $(WEBDIR) ;\ + echo install -p $$file $(WEBDIR) ;\ + install -p $$file $(WEBDIR) ;\ fi ;\ done @cd xml && $(MAKE) CC="$(CC)" LD="$(LD)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" @@ -149,8 +139,7 @@ ######## xmlparse.c : xmlparse.l - $(LEX) $(LEXFLAGS) $< - -@mv lex.yy.c xmlparse.c + $(LEX) $(LEXFLAGS) -o xmlparse.c $< @echo Created xmlparse.c ######## @@ -167,8 +156,8 @@ -[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir) @[ -d $(DESTDIR)$(bindir) ] && \ for file in $(EXE); do \ - echo cp $$file $(DESTDIR)$(bindir) ;\ - cp -f $$file $(DESTDIR)$(bindir) ;\ + echo install -p $$file $(DESTDIR)$(bindir)/routino-$$file ;\ + install -p $$file $(DESTDIR)$(bindir)/routino-$$file ;\ done ######## diff -ur routino-1.5.1/src/xml/Makefile routino-1.5.1-makefiles/src/xml/Makefile --- routino-1.5.1/src/xml/Makefile 2010-07-07 19:26:24.000000000 +0200 +++ routino-1.5.1-makefiles/src/xml/Makefile 2011-04-23 19:44:12.000000000 +0200 @@ -27,8 +27,8 @@ # Program options -CFLAGS=-Wall -Wmissing-prototypes -O0 -g -LDFLAGS=-lm -lc +CFLAGS+=-Wall -Wmissing-prototypes +LDFLAGS+=-lm -lc # Required to use stdio with files > 2GiB on 32-bit system. diff -ur routino-1.5.1/xml/Makefile routino-1.5.1-makefiles/xml/Makefile --- routino-1.5.1/xml/Makefile 2010-09-05 20:27:17.000000000 +0200 +++ routino-1.5.1-makefiles/xml/Makefile 2011-04-23 19:20:21.000000000 +0200 @@ -36,8 +36,8 @@ -@[ -d $(WEBDIR) ] && \ for file in $(FILES); do \ if [ ! -f $(WEBDIR)/$$file ] || [ routino-$$file -nt $(WEBDIR)/$$file ]; then \ - echo cp routino-$$file $(WEBDIR)/$$file ;\ - cp -f routino-$$file $(WEBDIR)/$$file ;\ + echo cp -pf routino-$$file $(WEBDIR)/$$file ;\ + cp -pf routino-$$file $(WEBDIR)/$$file ;\ fi ;\ done @@ -47,8 +47,8 @@ -[ -d $(DESTDIR)$(datadir) ] || mkdir -p $(DESTDIR)$(datadir) @[ -d $(DESTDIR)$(datadir) ] && \ for file in $(FILES); do \ - echo cp routino-$$file $(DESTDIR)$(datadir)/$$file ;\ - cp -f routino-$$file $(DESTDIR)$(datadir)/$$file ;\ + echo cp -pf routino-$$file $(DESTDIR)$(datadir)/$$file ;\ + cp -pf routino-$$file $(DESTDIR)$(datadir)/$$file ;\ done ########
