diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5000e9a7..a5726085 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,7 @@ jobs: run: i686-w64-mingw32-strip build/bin/limine.exe - name: Copy LICENSE to bin - run: cp LICENSE build/bin/ + run: cp COPYING build/bin/LICENSE - name: Copy install-sh to bin run: cp build-aux/install-sh build/bin/ diff --git a/.gitignore b/.gitignore index fff602a9..0bb5453e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ /freestanding-toolchain /configure /configure.ac.save +/INSTALL /build-aux /aclocal.m4 /*~ diff --git a/LICENSE b/COPYING similarity index 100% rename from LICENSE rename to COPYING diff --git a/GNUmakefile.in b/GNUmakefile.in index b23ac638..6e038619 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -141,7 +141,7 @@ clean: limine-bios-clean limine-uefi-ia32-clean limine-uefi-x86-64-clean limine- .PHONY: install install: all $(INSTALL) -d '$(call SHESCAPE,$(DESTDIR)$(docdir))' - $(INSTALL_DATA) '$(call SHESCAPE,$(SRCDIR))/LICENSE' '$(call SHESCAPE,$(DESTDIR)$(docdir))/' + $(INSTALL_DATA) '$(call SHESCAPE,$(SRCDIR))/COPYING' '$(call SHESCAPE,$(DESTDIR)$(docdir))/' $(INSTALL_DATA) '$(call SHESCAPE,$(SRCDIR))/CONFIG.md' '$(call SHESCAPE,$(DESTDIR)$(docdir))/' $(INSTALL_DATA) '$(call SHESCAPE,$(SRCDIR))/PROTOCOL.md' '$(call SHESCAPE,$(DESTDIR)$(docdir))/' $(INSTALL_DATA) '$(call SHESCAPE,$(SRCDIR))/PHILOSOPHY.md' '$(call SHESCAPE,$(DESTDIR)$(docdir))/' @@ -185,7 +185,7 @@ install-strip: install .PHONY: uninstall uninstall: - rm -f '$(call SHESCAPE,$(DESTDIR)$(docdir))/LICENSE' + rm -f '$(call SHESCAPE,$(DESTDIR)$(docdir))/COPYING' rm -f '$(call SHESCAPE,$(DESTDIR)$(docdir))/CONFIG.md' rm -f '$(call SHESCAPE,$(DESTDIR)$(docdir))/PROTOCOL.md' rm -f '$(call SHESCAPE,$(DESTDIR)$(docdir))/PHILOSOPHY.md' @@ -291,6 +291,7 @@ dist: $(MKDIR_P) '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" cp -r '$(call SHESCAPE,$(SRCDIR))'/.git '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)"/ cd '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" && git checkout . + cd '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" && git log --oneline --decorate > ChangeLog cd '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" && ./bootstrap rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/common/flanterm/.git" rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/freestanding-headers/.git" @@ -325,7 +326,7 @@ distclean: clean .PHONY: maintainer-clean maintainer-clean: distclean - cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf common/flanterm common/stb/stb_image.h decompressor/tinf freestanding-headers libgcc-binaries limine-efi freestanding-toolchain configure build-aux *'~' autom4te.cache aclocal.m4 *.tar.xz *.tar.gz + cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf common/flanterm common/stb/stb_image.h decompressor/tinf freestanding-headers libgcc-binaries limine-efi freestanding-toolchain configure INSTALL build-aux *'~' autom4te.cache aclocal.m4 *.tar.xz *.tar.gz .PHONY: common-uefi-x86-64 common-uefi-x86-64: diff --git a/bootstrap b/bootstrap index 87251592..7cca6862 100755 --- a/bootstrap +++ b/bootstrap @@ -26,7 +26,9 @@ fi [ -d limine-efi ] || git clone https://github.com/limine-bootloader/limine-efi.git $SHALLOW_CLONE_FLAG [ -d libgcc-binaries ] || git clone https://github.com/mintsuki/libgcc-binaries.git $SHALLOW_CLONE_FLAG +AUTOMAKE_LIBDIR="$(automake --print-libdir)" +cp "${AUTOMAKE_LIBDIR}/INSTALL" ./ mkdir -p build-aux -cp "$(automake --print-libdir)/install-sh" build-aux +cp "${AUTOMAKE_LIBDIR}/install-sh" build-aux/ autoreconf -fvi -Wall diff --git a/configure.ac b/configure.ac index 8f88da9e..01b2adb5 100644 --- a/configure.ac +++ b/configure.ac @@ -336,7 +336,7 @@ m4_define([DEFAULT_LDFLAGS_FOR_TARGET], []) AC_ARG_VAR([LDFLAGS_FOR_TARGET], [linker flags for Limine @<:@default: ]DEFAULT_LDFLAGS_FOR_TARGET[@:>@]) test "x$LDFLAGS_FOR_TARGET" = "x" && LDFLAGS_FOR_TARGET="DEFAULT_LDFLAGS_FOR_TARGET" -LIMINE_COPYRIGHT=$($GREP Copyright "$SRCDIR/LICENSE") +LIMINE_COPYRIGHT=$($GREP Copyright "$SRCDIR/COPYING") AC_SUBST([LIMINE_COPYRIGHT]) AC_PREFIX_DEFAULT([/usr/local])