From b1ddf671c365ff8f7a6610b8580e5debed336ce2 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Tue, 22 Oct 2024 13:38:45 +0200 Subject: [PATCH] fix install --- .gitignore | 4 +++- Makefile | 12 ++++++------ dist/firmware/Makefile | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 63bb23d..b657fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,9 @@ /src/qemu-git/config-all-devices.mak /dist/x49gp /dist/sdcard +/dist/x49gp.desktop +/dist/x49gp.man /dist/firmware/*.zip /dist/firmware/hp-arm-models-bootloader/ /dist/firmware/hp4950v215/ -/dist/firmware/newrpl/ +/dist/firmware/newrpl-latest/ diff --git a/Makefile b/Makefile index 8d194c2..8450592 100644 --- a/Makefile +++ b/Makefile @@ -68,8 +68,8 @@ INCLUDES = $(GDB_INCLUDES) $(X49GP_INCLUDES) INSTALL_PREFIX = /usr/local INSTALL_BINARY_DIR = "$(INSTALL_PREFIX)"/bin -INSTALL_DATA_DIR = "$(INSTALL_PREFIX)"/share/$(TARGET) -INSTALL_DOC_DIR = "$(INSTALL_PREFIX)"/doc/$(TARGET) +INSTALL_DATA_DIR = "$(INSTALL_PREFIX)"/share/$(TARGET_BIN) +INSTALL_DOC_DIR = "$(INSTALL_PREFIX)"/doc/$(TARGET_BIN) INSTALL_MENU_DIR = "$(INSTALL_PREFIX)"/share/applications INSTALL_MAN_DIR = "$(INSTALL_PREFIX)/share/man/man1" DEFINES += -DX49GP_DATADIR=\"$(INSTALL_DATA_DIR)\" @@ -148,12 +148,12 @@ $(TARGET): $(OBJS) $(VVFATOBJS) $(QEMU_OBJS) $(CC) $(LDFLAGS) $(X49GP_LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS) $(X49GP_LDLIBS) install: all $(TARGET).desktop $(TARGET).man - install -D -m 755 $(TARGET) "$(DESTDIR)$(INSTALL_BINARY_DIR)/$(TARGET)" + install -D -m 755 $(TARGET) "$(DESTDIR)$(INSTALL_BINARY_DIR)/$(TARGET_BIN)" install -D -m 644 $(IMAGE49GP) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(IMAGE49GP)" install -D -m 644 $(IMAGE50G) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(IMAGE50G)" - install -D -m 755 dist/firmware "$(DESTDIR)$(INSTALL_DATA_DIR)/firmware" - install -D -m 644 $(TARGET).desktop "$(DESTDIR)$(INSTALL_MENU_DIR)/$(TARGET).desktop" - install -D -m 644 $(TARGET).man "$(DESTDIR)$(INSTALL_MAN_DIR)/$(TARGET).1" + install -D -m 644 $(TARGET).desktop "$(DESTDIR)$(INSTALL_MENU_DIR)/$(TARGET_BIN).desktop" + install -D -m 644 $(TARGET).man "$(DESTDIR)$(INSTALL_MAN_DIR)/$(TARGET_BIN).1" + cp -R dist/firmware "$(DESTDIR)$(INSTALL_DATA_DIR)/firmware" $(TARGET).desktop: $(TARGET).desktop.in perl -p -e "s!TARGET!$(TARGET_BIN)!" < $(TARGET).desktop.in >$@ diff --git a/dist/firmware/Makefile b/dist/firmware/Makefile index f239e08..19dc673 100644 --- a/dist/firmware/Makefile +++ b/dist/firmware/Makefile @@ -16,6 +16,6 @@ official: rm hp4950v215.zip newrpl: - mkdir -p newrpl - wget https://hpgcc3.org/downloads/newrplfw.bin -O newrpl/newrplfw.bin - echo "newrplfw.bin" > newrpl/update.scp + mkdir -p newrpl-latest + wget https://hpgcc3.org/downloads/newrplfw.bin -O newrpl-latest/newrplfw.bin + echo "newrplfw.bin" > newrpl-latest/update.scp