[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog doc/omf.make doc/C/Makefile.am
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ./ChangeLog doc/omf.make doc/C/Makefile.am |
Date: |
Thu, 18 May 2006 07:40:21 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Sandro Santilli <address@hidden> 06/05/18 07:40:21
Modified files:
. : ChangeLog
doc : omf.make
doc/C : Makefile.am
Log message:
Patch by Patrice Dumas:
* doc/omf.make: don't use DESTDIR for scrollkeeper-update cache
directory, such that scrollkeeper-update fails if not run at
root, instead of creating directories that are left over when
doing staged install.
* doc/C/Makefile.am: add - in front of the install-info version
test to ignore errors.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.350&tr2=1.351&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/omf.make.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.350 gnash/ChangeLog:1.351
--- gnash/ChangeLog:1.350 Wed May 17 11:10:51 2006
+++ gnash/ChangeLog Thu May 18 07:40:20 2006
@@ -1,3 +1,12 @@
+2006-05-18 Patrice Dumas <address@hidden>
+
+ * doc/omf.make: don't use DESTDIR for scrollkeeper-update cache
+ directory, such that scrollkeeper-update fails if not run at
+ root, instead of creating directories that are left over when
+ doing staged install.
+ * doc/C/Makefile.am: add - in front of the install-info version
+ test to ignore errors.
+
2006-05-17 Bastiaan Jacques <address@hidden>
* backend/gnash.cpp: Create the OpenGL render handler only after
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.26 gnash/doc/C/Makefile.am:1.27
--- gnash/doc/C/Makefile.am:1.26 Wed May 3 07:38:24 2006
+++ gnash/doc/C/Makefile.am Thu May 18 07:40:21 2006
@@ -198,7 +198,7 @@
install-info-hook: gnash.info
test -d "$(DESTDIR)$(infodir)" || $(mkinstalldirs)
"$(DESTDIR)$(infodir)"
$(INSTALL_DATA) $< $(DESTDIR)$(infodir)/gnash.info
- if (install-info --version) >/dev/null 2>&1; then \
+ -if (install-info --version) >/dev/null 2>&1; then \
version=`install-info --version | grep -c 'GNU texinfo'`; \
if test $$version -eq 0; then \
install-info --menuentry="Gnash" --description="GNU Flash Player"
--info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null
2>&1; \
Index: gnash/doc/omf.make
diff -u gnash/doc/omf.make:1.9 gnash/doc/omf.make:1.10
--- gnash/doc/omf.make:1.9 Sun Apr 23 02:51:44 2006
+++ gnash/doc/omf.make Thu May 18 07:40:20 2006
@@ -42,11 +42,11 @@
for file in $(omffile); do \
$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
done
- $(SCROLLUPDATE) -v -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
+ -$(SCROLLUPDATE) -v -p $(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
uninstall-omf-hook:
-for file in $(omffile); do \
$(RM) $(DESTDIR)$(omf_dest_dir)/$$file; \
done
-rmdir $(DESTDIR)$(omf_dest_dir)
- $(SCROLLUPDATE) -v -p $(DESTDIR)$(scrollkeeper_localstate_dir)
+ -$(SCROLLUPDATE) -v -p $(scrollkeeper_localstate_dir)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog doc/omf.make doc/C/Makefile.am,
Sandro Santilli <=