[routino] Fix a 3rd makefile error.
Kevin Kofler
kkofler at fedoraproject.org
Sat Oct 15 01:17:16 UTC 2011
commit 4b764a46f1f1024efc8495d1ce8a6c1212d95d7b
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat Oct 15 03:17:08 2011 +0200
Fix a 3rd makefile error.
routino-2.1-makefiles.patch | 13 +++++++++----
routino.spec | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/routino-2.1-makefiles.patch b/routino-2.1-makefiles.patch
index 47f7c89..9446dea 100644
--- a/routino-2.1-makefiles.patch
+++ b/routino-2.1-makefiles.patch
@@ -137,8 +137,8 @@ diff -ur routino-2.1/src/xml/Makefile routino-2.1-makefiles/src/xml/Makefile
diff -ur routino-2.1/xml/Makefile routino-2.1-makefiles/xml/Makefile
--- routino-2.1/xml/Makefile 2011-09-05 20:12:00.000000000 +0200
-+++ routino-2.1-makefiles/xml/Makefile 2011-10-15 03:12:33.000000000 +0200
-@@ -39,14 +39,15 @@
++++ routino-2.1-makefiles/xml/Makefile 2011-10-15 03:15:57.000000000 +0200
+@@ -39,17 +39,19 @@
-@[ -d $(WEBDATADIR) ] && \
for file in $(STANDARD_FILES); do \
if [ ! -f $(WEBDATADIR)/$$file ] || [ routino-$$file -nt $(WEBDATADIR)/$$file ]; then \
@@ -158,8 +158,13 @@ diff -ur routino-2.1/xml/Makefile routino-2.1-makefiles/xml/Makefile
+ cp -pf $$file $(WEBDATADIR)/$$file ;\
fi ;\
done
- - at if [ ! -f $(WEBWWWDIR)/profiles.js ] || [ ! -f $(WEBWWWDIR)/profiles.pl ] || \
-@@ -72,9 +73,14 @@
+- - at if [ ! -f $(WEBWWWDIR)/profiles.js ] || [ ! -f $(WEBWWWDIR)/profiles.pl ] || \
++ -@[ -d $(WEBWWWDIR) ] && \
++ if [ ! -f $(WEBWWWDIR)/profiles.js ] || [ ! -f $(WEBWWWDIR)/profiles.pl ] || \
+ [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.pl ] || \
+ [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.js ]; then \
+ echo perl update-profiles.pl ;\
+@@ -72,9 +74,14 @@
install: all
-[ -d $(DESTDIR)$(datadir) ] || mkdir -p $(DESTDIR)$(datadir)
@[ -d $(DESTDIR)$(datadir) ] && \
diff --git a/routino.spec b/routino.spec
index 493df44..d91f4ec 100644
--- a/routino.spec
+++ b/routino.spec
@@ -52,7 +52,7 @@ rm -rf %{buildroot}
* Sat Oct 15 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-1
- Update to 2.1 (#742903)
- README-MARBLE.txt: update: data files from 2.0(.x) versions no longer work
-- Rebase makefiles patch and fix 2 new makefile errors
+- Rebase makefiles patch and fix 3 new makefile errors
* Fri Aug 05 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.3-1
- Update to 2.0.3 (#728490, bugfix release)
More information about the scm-commits
mailing list