Skip to content

Commit 682dc94

Browse files
committed
install: honour PREFIX
- From a .deb package, flexbridge is installed to /usr, but in flatpak, flexbridge is installed to /app.
1 parent 75dc970 commit 682dc94

1 file changed

Lines changed: 27 additions & 26 deletions

File tree

Makefile

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ UploadFolder="Alpha"
1313
# Work around proxy bug in older mono to allow dependency downloads
1414
no_proxy := $(no_proxy),*.local
1515
GECKOFX60_VERSION := 60.0.51
16+
PREFIX ?= /usr
1617

1718
all: release
1819

@@ -73,32 +74,32 @@ fetch_l10ns:
7374
'
7475

7576
install: fetch_l10ns
76-
/usr/bin/install -d $(DESTDIR)/usr/lib/flexbridge
77-
/usr/bin/install output/Release/net461/*.* $(DESTDIR)/usr/lib/flexbridge
78-
/bin/chmod -x $(DESTDIR)/usr/lib/flexbridge/*.htm
79-
/bin/chmod -x $(DESTDIR)/usr/lib/flexbridge/*.png
80-
/bin/chmod -x $(DESTDIR)/usr/lib/flexbridge/*.config
81-
/usr/bin/install flexbridge environ-xulrunner $(DESTDIR)/usr/lib/flexbridge
82-
/usr/bin/install lib/common/run-app $(DESTDIR)/usr/lib/flexbridge
83-
cp -r Mercurial $(DESTDIR)/usr/lib/flexbridge
84-
cp -r MercurialExtensions $(DESTDIR)/usr/lib/flexbridge
85-
/usr/bin/install lib/common/Chorus_Help.chm $(DESTDIR)/usr/lib/flexbridge
86-
/usr/bin/install lib/common/chorusmerge $(DESTDIR)/usr/lib/flexbridge
87-
/usr/bin/install -d $(DESTDIR)/usr/lib/flexbridge/localizations
88-
/usr/bin/install -m644 output/Release/net461/localizations/*.* $(DESTDIR)/usr/lib/flexbridge/localizations
77+
/usr/bin/install -d $(DESTDIR)$(PREFIX)/lib/flexbridge
78+
/usr/bin/install output/Release/net461/*.* $(DESTDIR)$(PREFIX)/lib/flexbridge
79+
/bin/chmod -x $(DESTDIR)$(PREFIX)/lib/flexbridge/*.htm
80+
/bin/chmod -x $(DESTDIR)$(PREFIX)/lib/flexbridge/*.png
81+
/bin/chmod -x $(DESTDIR)$(PREFIX)/lib/flexbridge/*.config
82+
/usr/bin/install flexbridge environ-xulrunner $(DESTDIR)$(PREFIX)/lib/flexbridge
83+
/usr/bin/install lib/common/run-app $(DESTDIR)$(PREFIX)/lib/flexbridge
84+
cp -r Mercurial $(DESTDIR)$(PREFIX)/lib/flexbridge
85+
cp -r MercurialExtensions $(DESTDIR)$(PREFIX)/lib/flexbridge
86+
/usr/bin/install lib/common/Chorus_Help.chm $(DESTDIR)$(PREFIX)/lib/flexbridge
87+
/usr/bin/install lib/common/chorusmerge $(DESTDIR)$(PREFIX)/lib/flexbridge
88+
/usr/bin/install -d $(DESTDIR)$(PREFIX)/lib/flexbridge/localizations
89+
/usr/bin/install -m644 output/Release/net461/localizations/*.* $(DESTDIR)$(PREFIX)/lib/flexbridge/localizations
8990
/usr/bin/install -d $(DESTDIR)/var/lib/flexbridge/localizations
9091
/usr/bin/install -m644 output/Release/net461/localizations/*.* $(DESTDIR)/var/lib/flexbridge/localizations
91-
/usr/bin/install -d $(DESTDIR)/usr/bin
92-
/usr/bin/install lib/common/fieldworks-chorus $(DESTDIR)/usr/bin
93-
/usr/bin/install lib/common/fieldworks-chorushub $(DESTDIR)/usr/bin
94-
/usr/bin/install -d $(DESTDIR)/usr/share/pixmaps
95-
/usr/bin/install -m644 lib/common/chorusHubIcon.png $(DESTDIR)/usr/share/pixmaps
96-
/usr/bin/install -d $(DESTDIR)/usr/share/applications
97-
/usr/bin/install -m644 lib/common/fieldworks-chorushub.desktop $(DESTDIR)/usr/share/applications
92+
/usr/bin/install -d $(DESTDIR)$(PREFIX)/bin
93+
/usr/bin/install lib/common/fieldworks-chorus $(DESTDIR)$(PREFIX)/bin
94+
/usr/bin/install lib/common/fieldworks-chorushub $(DESTDIR)$(PREFIX)/bin
95+
/usr/bin/install -d $(DESTDIR)$(PREFIX)/share/pixmaps
96+
/usr/bin/install -m644 lib/common/chorusHubIcon.png $(DESTDIR)$(PREFIX)/share/pixmaps
97+
/usr/bin/install -d $(DESTDIR)$(PREFIX)/share/applications
98+
/usr/bin/install -m644 lib/common/fieldworks-chorushub.desktop $(DESTDIR)$(PREFIX)/share/applications
9899
# remove unwanted stuff
99-
/bin/rm -f $(DESTDIR)/usr/lib/flexbridge/FwdataTestApp.*
100-
/bin/rm -f $(DESTDIR)/usr/lib/flexbridge/*.TestUtilities.*
101-
/bin/rm -f $(DESTDIR)/usr/lib/flexbridge/*Bridge-ChorusPluginTests.*
102-
/bin/rm -f $(DESTDIR)/usr/lib/flexbridge/nunit.framework.*
103-
/bin/rm -f $(DESTDIR)/usr/lib/flexbridge/TheTurtle.*
104-
/bin/rm -f $(DESTDIR)/usr/lib/flexbridge/NetSparkle.*
100+
/bin/rm -f $(DESTDIR)$(PREFIX)/lib/flexbridge/FwdataTestApp.*
101+
/bin/rm -f $(DESTDIR)$(PREFIX)/lib/flexbridge/*.TestUtilities.*
102+
/bin/rm -f $(DESTDIR)$(PREFIX)/lib/flexbridge/*Bridge-ChorusPluginTests.*
103+
/bin/rm -f $(DESTDIR)$(PREFIX)/lib/flexbridge/nunit.framework.*
104+
/bin/rm -f $(DESTDIR)$(PREFIX)/lib/flexbridge/TheTurtle.*
105+
/bin/rm -f $(DESTDIR)$(PREFIX)/lib/flexbridge/NetSparkle.*

0 commit comments

Comments
 (0)