db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-01-18 04:58:51 +02:00
Code Issues Releases Activity

Make DESTDIR fully-configurable in the Makefile.

Browse Source 
DESTDIR always had /usr/bin appended which was a problem systems that don't use /usr/bin as the install location for binaries.

Instead, use the value of DESTDIR exactly and update the Debian packages accordingly.

Contributed by Douglas J Hunley.
This commit is contained in:
Douglas J Hunley 2019-03-09 11:40:55 +02:00 committed by David Steele
parent 60fe5b7365
commit 786e77a9fe
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/xml/release.xml
View File

@ -119,6 +119,14 @@
<p><code>MemContext</code> improvements. Improve performance of context and memory allocations. Use <code>contextTop</code>/<code>contextCurrent</code> instead of <code>memContextTop()</code>/<code>memContextCurrent()</code>. Don't make a copy of the context name.</p>
</release-item>
<release-item>
<release-item-contributor-list>
<release-item-contributor id="douglas.j.hunley"/>
</release-item-contributor-list>
<p>Make <id>DESTDIR</id> fully-configurable in the <file>Makefile</file>.</p>
</release-item>
<release-item>
<release-item-contributor-list>
<release-item-contributor id="luca.ferrari"/>

8
src/Makefile
View File

@ -51,7 +51,7 @@ LDFLAGS = -lcrypto -lssl -lxml2 -lz $(LDPERL) $(LDEXTRA)
# Install options
####################################################################################################################################
# Modify destination install directory
DESTDIR =
DESTDIR = /usr/bin
####################################################################################################################################
# List of required source files. main.c should always be listed last and the rest in alpha order.
@ -175,14 +175,14 @@ pgbackrest: $(OBJS)
# Installation. DESTDIR can be used to modify the install location.
####################################################################################################################################
install: pgbackrest
install -d $(DESTDIR)/usr/bin
install -m 755 pgbackrest $(DESTDIR)/usr/bin
install -d $(DESTDIR)
install -m 755 pgbackrest $(DESTDIR)
####################################################################################################################################
# Uninstallation. DESTDIR should be set to the same value as when installed.
####################################################################################################################################
uninstall:
rm -f $(DESTDIR)/usr/bin/pgbackrest
rm -f $(DESTDIR)/pgbackrest
####################################################################################################################################
# Clean object files and executable created by make

11
test/patch/debian-package.patch Normal file
View File

@ -0,0 +1,11 @@
--- rules
+++ rules
@@ -34,7 +34,7 @@
dh_auto_clean
override_dh_auto_install:
- make -C src install DESTDIR=$(CURDIR)/debian/pgbackrest
+ make -C src install DESTDIR=$(CURDIR)/debian/pgbackrest/usr/bin
dh_auto_install
.PHONY: build