diff options
| author | Sadie Powell <sadie@witchery.services> | 2020-05-16 14:25:24 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2020-05-16 14:25:24 +0100 |
| commit | 87bb27a7a794d413bd75ea17d4e1f83e207c8bdc (patch) | |
| tree | 25fbe66a0db74f36f561d99c52e86127ce52b218 /make | |
| parent | 5a95d907d45c972c883fc0e763db1b960ecff55a (diff) | |
Implement support for portable installations.
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.pm | 6 | ||||
| -rw-r--r-- | make/template/main.mk | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/make/configure.pm b/make/configure.pm index 1ce5a1c1e..bd3591e3c 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -272,10 +272,12 @@ sub parse_templates($$$) { chomp $line; # Does this line match a variable? - while ($line =~ /(@(\w+?)@)/) { - my ($variable, $name) = ($1, $2); + while ($line =~ /(@(\w+?)(?:\|(\w*))?@)/) { + my ($variable, $name, $default) = ($1, $2, $3); if (defined $settings{$name}) { $line =~ s/\Q$variable\E/$settings{$name}/; + } elsif (defined $default) { + $line =~ s/\Q$variable\E/$default/; } else { print_warning "unknown template variable '$name' in $_!"; last; diff --git a/make/template/main.mk b/make/template/main.mk index a57595c9d..6bd1d390d 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -49,6 +49,7 @@ LDLIBS = -lstdc++ CORELDFLAGS = -rdynamic -L. PICLDFLAGS = -fPIC -shared -rdynamic +DESTDIR := $(if $(DESTDIR),$(DESTDIR),"@DESTDIR|@") BASE = "$(DESTDIR)@BASE_DIR@" BINPATH = "$(DESTDIR)@BINARY_DIR@" CONPATH = "$(DESTDIR)@CONFIG_DIR@" |