chiark / gitweb /
Merge commit 'refs/top-bases/debian/locations' into debian/locations
authormartin f. krafft <madduck@debian.org>
Tue, 12 Aug 2008 17:34:25 +0000 (14:34 -0300)
committermartin f. krafft <madduck@debian.org>
Tue, 12 Aug 2008 17:34:25 +0000 (14:34 -0300)
Conflicts:

Makefile

1  2 
Makefile

diff --cc Makefile
index 9b826c8e787dbfccee6b738ccc8cef1117cfbb60,bafec268d4355976a7a2dfcded9914e49050c18a..07b549b40cc6e4f106ade5fb6c4edeba32fa7ef1
+++ b/Makefile
@@@ -31,14 -31,14 +31,14 @@@ $(help_out): READM
        ./create-help.sh $$CMD
  
  install:: all
-       install -d -m 755 "$(bindir)"
-       install tg "$(bindir)"
-       install -d -m 755 "$(cmddir)"
-       install $(commands_out) "$(cmddir)"
-       install -d -m 755 "$(hooksdir)"
-       install $(hooks_out) "$(hooksdir)"
-       install -d -m 755 "$(docdir)"
-       install -m 644 $(help_out) "$(docdir)"
+       install -d -m 755 "$(DESTDIR)$(bindir)"
+       install tg "$(DESTDIR)$(bindir)"
+       install -d -m 755 "$(DESTDIR)$(cmddir)"
+       install $(commands_out) "$(DESTDIR)$(cmddir)"
+       install -d -m 755 "$(DESTDIR)$(hooksdir)"
+       install $(hooks_out) "$(DESTDIR)$(hooksdir)"
 -      install -d -m 755 "$(DESTDIR)$(sharedir)"
 -      install -m 644 $(help_out) "$(DESTDIR)$(sharedir)"
++      install -d -m 755 "$(DESTDIR)$(docdir)"
++      install -m 644 $(help_out) "$(DESTDIR)$(docdir)"
  
  clean::
        rm -f tg $(commands_out) $(hooks_out) $(help_out)