fix install

This commit is contained in:
Gwenhael Le Moine 2024-10-22 13:38:45 +02:00
parent f421cd202d
commit b1ddf671c3
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
3 changed files with 12 additions and 10 deletions

4
.gitignore vendored
View file

@ -10,7 +10,9 @@
/src/qemu-git/config-all-devices.mak /src/qemu-git/config-all-devices.mak
/dist/x49gp /dist/x49gp
/dist/sdcard /dist/sdcard
/dist/x49gp.desktop
/dist/x49gp.man
/dist/firmware/*.zip /dist/firmware/*.zip
/dist/firmware/hp-arm-models-bootloader/ /dist/firmware/hp-arm-models-bootloader/
/dist/firmware/hp4950v215/ /dist/firmware/hp4950v215/
/dist/firmware/newrpl/ /dist/firmware/newrpl-latest/

View file

@ -68,8 +68,8 @@ INCLUDES = $(GDB_INCLUDES) $(X49GP_INCLUDES)
INSTALL_PREFIX = /usr/local INSTALL_PREFIX = /usr/local
INSTALL_BINARY_DIR = "$(INSTALL_PREFIX)"/bin INSTALL_BINARY_DIR = "$(INSTALL_PREFIX)"/bin
INSTALL_DATA_DIR = "$(INSTALL_PREFIX)"/share/$(TARGET) INSTALL_DATA_DIR = "$(INSTALL_PREFIX)"/share/$(TARGET_BIN)
INSTALL_DOC_DIR = "$(INSTALL_PREFIX)"/doc/$(TARGET) INSTALL_DOC_DIR = "$(INSTALL_PREFIX)"/doc/$(TARGET_BIN)
INSTALL_MENU_DIR = "$(INSTALL_PREFIX)"/share/applications INSTALL_MENU_DIR = "$(INSTALL_PREFIX)"/share/applications
INSTALL_MAN_DIR = "$(INSTALL_PREFIX)/share/man/man1" INSTALL_MAN_DIR = "$(INSTALL_PREFIX)/share/man/man1"
DEFINES += -DX49GP_DATADIR=\"$(INSTALL_DATA_DIR)\" 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) $(CC) $(LDFLAGS) $(X49GP_LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS) $(X49GP_LDLIBS)
install: all $(TARGET).desktop $(TARGET).man 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 $(IMAGE49GP) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(IMAGE49GP)"
install -D -m 644 $(IMAGE50G) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(IMAGE50G)" 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_BIN).desktop"
install -D -m 644 $(TARGET).desktop "$(DESTDIR)$(INSTALL_MENU_DIR)/$(TARGET).desktop" install -D -m 644 $(TARGET).man "$(DESTDIR)$(INSTALL_MAN_DIR)/$(TARGET_BIN).1"
install -D -m 644 $(TARGET).man "$(DESTDIR)$(INSTALL_MAN_DIR)/$(TARGET).1" cp -R dist/firmware "$(DESTDIR)$(INSTALL_DATA_DIR)/firmware"
$(TARGET).desktop: $(TARGET).desktop.in $(TARGET).desktop: $(TARGET).desktop.in
perl -p -e "s!TARGET!$(TARGET_BIN)!" < $(TARGET).desktop.in >$@ perl -p -e "s!TARGET!$(TARGET_BIN)!" < $(TARGET).desktop.in >$@

View file

@ -16,6 +16,6 @@ official:
rm hp4950v215.zip rm hp4950v215.zip
newrpl: newrpl:
mkdir -p newrpl mkdir -p newrpl-latest
wget https://hpgcc3.org/downloads/newrplfw.bin -O newrpl/newrplfw.bin wget https://hpgcc3.org/downloads/newrplfw.bin -O newrpl-latest/newrplfw.bin
echo "newrplfw.bin" > newrpl/update.scp echo "newrplfw.bin" > newrpl-latest/update.scp