[MediaWiki-commits] [Gerrit] integration/uprightdiff[master]: Support DESTDIR in Makefile

[Tim Starling (Code Review)]

Tim Starling has submitted this change and it was merged.

Change subject: Support DESTDIR in Makefile
..


Support DESTDIR in Makefile

This is used by Debian packaging to install in a separate directory
until it is ready to install it.

If not set, it will still install in the same location as previously.

Change-Id: I9bc50b3d8bc82aa56e1459917e68b4978e80d02a
---
M Makefile
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Tim Starling: Verified; Looks good to me, approved



diff --git a/Makefile b/Makefile
index 8047485..5f3ce14 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@
 all: uprightdiff
 
 install: all
-   install -d $(PREFIX)/bin
-   install -s uprightdiff $(PREFIX)/bin/uprightdiff
+   install -d $(DESTDIR)$(PREFIX)/bin
+   install -s uprightdiff $(DESTDIR)$(PREFIX)/bin/uprightdiff
 
 uprightdiff:
g++ $(CFLAGS) main.cpp BlockMotionSearch.cpp UprightDiff.cpp \

-- 
To view, visit https://gerrit.wikimedia.org/r/325721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bc50b3d8bc82aa56e1459917e68b4978e80d02a
Gerrit-PatchSet: 1
Gerrit-Project: integration/uprightdiff
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: Tim Starling 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/uprightdiff[master]: Support DESTDIR in Makefile

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325721

Change subject: Support DESTDIR in Makefile
..

Support DESTDIR in Makefile

This is used by Debian packaging to install in a separate directory
until it is ready to install it.

If not set, it will still install in the same location as previously.

Change-Id: I9bc50b3d8bc82aa56e1459917e68b4978e80d02a
---
M Makefile
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/uprightdiff 
refs/changes/21/325721/1

diff --git a/Makefile b/Makefile
index 8047485..5f3ce14 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@
 all: uprightdiff
 
 install: all
-   install -d $(PREFIX)/bin
-   install -s uprightdiff $(PREFIX)/bin/uprightdiff
+   install -d $(DESTDIR)$(PREFIX)/bin
+   install -s uprightdiff $(DESTDIR)$(PREFIX)/bin/uprightdiff
 
 uprightdiff:
g++ $(CFLAGS) main.cpp BlockMotionSearch.cpp UprightDiff.cpp \

-- 
To view, visit https://gerrit.wikimedia.org/r/325721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bc50b3d8bc82aa56e1459917e68b4978e80d02a
Gerrit-PatchSet: 1
Gerrit-Project: integration/uprightdiff
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits