← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gwhere/maverick

« back to all changes in this revision

Viewing changes to debian/patches/02_destdir.diff

  • Committer: Bazaar Package Importer
  • Author(s): Bart Martens
  • Date: 2007-01-27 16:01:01 UTC
  • mfrom: (2.1.1 feisty)
  • Revision ID: james.westby@ubuntu.com-20070127160101-u673yo4vke03jg26
Tags: 0.2.3.dfsg.1-2
http://bugs.debian.org/405137
http://bugs.debian.org/405138
* debian/rules: Convert gwhere.desktop to UTF-8.  Closes: #405137.
* debian/rules: Replace all "extraibles" with "extraíbles" in
  gwhere.desktop.  Closes: #405138.
* debian/copyright: Updated for year 2007.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_destdir.diff
 
1
diff -ruN ../orig/gwhere-0.2.3/po/Makefile.in.in ./po/Makefile.in.in
 
2
--- ../orig/gwhere-0.2.3/po/Makefile.in.in      2004-03-09 00:44:17.000000000 +0100
 
3
+++ ./po/Makefile.in.in 2006-11-27 08:09:36.000000000 +0100
 
4
@@ -28,6 +28,8 @@
 
5
 INSTALL_DATA = @INSTALL_DATA@
 
6
 MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
 
7
 
 
8
+DESTDIR =
 
9
+
 
10
 CC = @CC@
 
11
 GENCAT = @GENCAT@
 
12
 GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
 
13
@@ -111,9 +113,9 @@
 
14
 install-data-no: all
 
15
 install-data-yes: all
 
16
        if test -r "$(MKINSTALLDIRS)"; then \
 
17
-         $(MKINSTALLDIRS) $(datadir); \
 
18
+         $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
 
19
        else \
 
20
-         $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
 
21
+         $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
 
22
        fi
 
23
        @catalogs='$(CATALOGS)'; \
 
24
        for cat in $$catalogs; do \
 
25
@@ -125,27 +127,27 @@
 
26
          lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 
27
          dir=$$destdir/$$lang/LC_MESSAGES; \
 
28
          if test -r "$(MKINSTALLDIRS)"; then \
 
29
-           $(MKINSTALLDIRS) $$dir; \
 
30
+           $(MKINSTALLDIRS) $(DESTDIR)$$dir; \
 
31
          else \
 
32
-           $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
 
33
+           $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
 
34
          fi; \
 
35
          if test -r $$cat; then \
 
36
-           $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
 
37
-           echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
 
38
+           $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
 
39
+           echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
 
40
          else \
 
41
-           $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
 
42
+           $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
 
43
            echo "installing $(srcdir)/$$cat as" \
 
44
-                "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
 
45
+                "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
 
46
          fi; \
 
47
          if test -r $$cat.m; then \
 
48
-           $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
 
49
-           echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
 
50
+           $(INSTALL_DATA) $$cat.m $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
 
51
+           echo "installing $$cat.m as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
 
52
          else \
 
53
            if test -r $(srcdir)/$$cat.m ; then \
 
54
              $(INSTALL_DATA) $(srcdir)/$$cat.m \
 
55
-               $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
 
56
+               $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
 
57
              echo "installing $(srcdir)/$$cat as" \
 
58
-                  "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
 
59
+                  "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
 
60
            else \
 
61
              true; \
 
62
            fi; \
 
63
@@ -153,12 +155,12 @@
 
64
        done
 
65
        if test "$(PACKAGE)" = "gettext"; then \
 
66
          if test -r "$(MKINSTALLDIRS)"; then \
 
67
-           $(MKINSTALLDIRS) $(gettextsrcdir); \
 
68
+           $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
 
69
          else \
 
70
-           $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
 
71
+           $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
 
72
          fi; \
 
73
          $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
 
74
-                         $(gettextsrcdir)/Makefile.in.in; \
 
75
+                         $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
 
76
        else \
 
77
          : ; \
 
78
        fi
 
79
@@ -171,12 +173,12 @@
 
80
        for cat in $$catalogs; do \
 
81
          cat=`basename $$cat`; \
 
82
          lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 
83
-         rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
 
84
-         rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 
85
-         rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
 
86
-         rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 
87
+         rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
 
88
+         rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 
89
+         rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
 
90
+         rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 
91
        done
 
92
-       rm -f $(gettextsrcdir)/po-Makefile.in.in
 
93
+       rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
 
94
 
 
95
 check: all
 
96