Merge branch 'debian-installer' into develop

Conflicts: README.mdown
antonini · Feb 14, 2012 · ab7fda2 · ab7fda2
2 parents cc5e9a5 + 1b454cc
commit ab7fda2
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 84 deletions.
diff --git a/Changes.mdown b/Changes.mdown
@@ -17,7 +17,7 @@ Release date: **not yet**
 
 * Better support for Windows and BSD users.
 
-* Add package installers for the Debian and Windows platforms.
+* Add package installer for the Windows platform.
 
 0.4.1:
 -----

diff --git a/Makefile b/Makefile
@@ -27,12 +27,7 @@
 # policies, either expressed or implied, of Vincent Driessen.
 #
 
-# Determine if we're inside a debian build .. 
-ifdef DEB_BUILD_ARCH
-   prefix=$(DESTDIR)/usr/
-else
-   prefix=/usr/local
-endif
+prefix=/usr/local
 
 # files that need mode 755
 EXEC_FILES=git-flow

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
diff --git a/contrib/debian/compat b/contrib/debian/compat
diff --git a/contrib/debian/control b/contrib/debian/control
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
diff --git a/contrib/debian/docs b/contrib/debian/docs
diff --git a/contrib/debian/rules b/contrib/debian/rules