diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-11-05 01:29:53 +0300 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-11-05 12:32:04 +0300 |
| commit | 9cce7d263ea3f2984a619cdfcb54d264c6a4c51d (patch) | |
| tree | 363314a72aa4fc3fda435086c8deb522aef247ec /distribute.mk.in | |
| parent | 36c7526d60319289954bb0b49e9f4cb2c6dfe9da (diff) | |
| download | sciteco-9cce7d263ea3f2984a619cdfcb54d264c6a4c51d.tar.gz | |
fully support relocatable binaries, improving AppImages
* You can now specify `--with-scitecodatadir` as a relative path,
that will be interpreted relative to the binary's location.
* Win32 binaries already were relocatable, but this was a Windows-specific
hack. Win32 binaries are now built with `--with-scitecodatadir=.`
since everything is in a single directory.
* Ubuntu packages are now also built `--with-scitecodatadir=../share/sciteco`.
This is not crucial for ordinary installations, but is meant for AppImage creation.
* Since AppImages are now built from relocatable packages,
we no longer need the unionfs-workaround from pkg2appimage.
This should fix the strange root contents when autocompleting in
AppImage builds.
* This might also fix the appimage.github.io CI issues.
I assume that because I could reproduce the issue on FreeBSD's
Linuxulator in dependence of pkg2appimage's "union"-setting.
See https://github.com/AppImage/appimage.github.io/pull/3402
* Determining the binary location actually turned out be hard and
very platform-dependant. There are now implementations for Windows
(which could also read argv[0]), Linux and generic UNIX (which
works on FreeBSD, but I am not sure about the others).
I believe this could also be useful on Mac OS to create app bundles,
but this needs to be tested - currently the Mac OS binaries are
installed into fixed locations and don't use relocation.
Diffstat (limited to 'distribute.mk.in')
| -rw-r--r-- | distribute.mk.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/distribute.mk.in b/distribute.mk.in index 0d6942c..4eb9b91 100644 --- a/distribute.mk.in +++ b/distribute.mk.in @@ -110,6 +110,7 @@ mingw-binary : @PACKAGE@-@PACKAGE_VERSION@-win32.zip PKG_CONFIG_LIBDIR=/usr/i686-w64-mingw32/lib/pkgconfig \ ./configure --host=i686-w64-mingw32 build=i386-pc-linux-gnu \ --prefix=/usr \ + --with-scitecodatadir=. \ --enable-static-executables \ --disable-dependency-tracking \ --with-interface=$(MINGW_UI) \ @@ -122,11 +123,11 @@ mingw-binary : @PACKAGE@-@PACKAGE_VERSION@-win32.zip install-strip DESTDIR=`pwd`/temp-install rm -rf $(SCITECO_DIR)/ mkdir temp-bin/ - cp -r temp-install/usr/bin/* temp-install/usr/share/sciteco/* \ + cp -r temp-install/usr/bin/* \ temp-install/usr/share/doc/sciteco/* \ temp-bin/ cp @srcdir@/win32.teco_ini temp-bin/.teco_ini || \ - cp temp-install/usr/share/sciteco/sample.teco_ini \ + cp temp-install/usr/bin/sample.teco_ini \ temp-bin/.teco_ini cp @srcdir@/COPYING @srcdir@/ChangeLog temp-bin/ rm -rf temp-install/ |