File ebview.patch of Package ebview
diff -ru ebview-0.3.5.orig/data/Makefile.am ebview-0.3.5/data/Makefile.am
--- ebview-0.3.5.orig/data/Makefile.am 2004-02-15 14:59:38.000000000 +0100
+++ ebview-0.3.5/data/Makefile.am 2004-02-24 16:12:21.000000000 +0100
@@ -6,13 +6,13 @@
install:
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(pkgdatadir); \
+ $(MKINSTALLDIRS) $(DESTDIR)/$(pkgdatadir); \
else \
- $(top_srcdir)/mkinstalldirs $(pkgdatadir); \
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(pkgdatadir); \
fi; \
data="$(data)"; \
for file in $$data; do \
- $(INSTALL_DATA) $(srcdir)/$$file $(pkgdatadir)/$$file; \
+ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)/$(pkgdatadir)/$$file; \
done;
# Define this as empty until I found a useful application.
@@ -21,7 +21,7 @@
uninstall:
data="$(data)"; \
for file in $$data; do \
- rm -f $(pkgdatadir)/$$file; \
+ rm -f $(DESTDIR)/$(pkgdatadir)/$$file; \
done
mostlyclean:
diff -ru ebview-0.3.5.orig/doc/Makefile.am ebview-0.3.5/doc/Makefile.am
--- ebview-0.3.5.orig/doc/Makefile.am 2004-02-15 14:59:38.000000000 +0100
+++ ebview-0.3.5/doc/Makefile.am 2004-02-24 16:12:21.000000000 +0100
@@ -9,15 +9,15 @@
dir="$(dir)"; \
for lang in $$dir; do \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(pkgdatadir)/help/$$lang; \
+ $(MKINSTALLDIRS) $(DESTDIR)/$(pkgdatadir)/help/$$lang; \
else \
- $(top_srcdir)/mkinstalldirs $(pkgdatadir)/help/$$lang; \
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(pkgdatadir)/help/$$lang; \
fi; \
done; \
data="$(data)"; \
for lang in $$dir; do \
for file in $$data; do \
- $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(pkgdatadir)/help/$$lang/$$file; \
+ $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(DESTDIR)/$(pkgdatadir)/help/$$lang/$$file; \
done; \
done;
@@ -25,5 +25,5 @@
installcheck:
uninstall:
- rm -fr $(pkgdatadir)/help
+ rm -fr $(DESTDIR)/$(pkgdatadir)/help
diff -ru ebview-0.3.5.orig/po/Makefile.in.in ebview-0.3.5/po/Makefile.in.in
--- ebview-0.3.5.orig/po/Makefile.in.in 2004-02-22 07:34:42.000000000 +0100
+++ ebview-0.3.5/po/Makefile.in.in 2004-02-24 16:12:21.000000000 +0100
@@ -115,9 +115,9 @@
install-data-no: all
install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) $(DESTDIR)/$(datadir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -127,7 +127,7 @@
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)/$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
diff -ru ebview-0.3.5.orig/src/grep.c ebview-0.3.5/src/grep.c
--- ebview-0.3.5.orig/src/grep.c 2004-02-22 04:43:50.000000000 +0100
+++ ebview-0.3.5/src/grep.c 2004-02-24 16:13:31.809799483 +0100
@@ -438,10 +438,10 @@
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &state);
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &state);
- // Create file list
+ /* Create file list */
push_message(_("Listing files..."));
- // Clear first
+ /* Clear first */
l = g_list_first(grep_file_list);
while(l != NULL){
g_free(l->data);
ebview-0.3.5/srcだけに発見: grep.c.~1~