From d81d3ebf2139841baca6656e8d6049378996fe15 Mon Sep 17 00:00:00 2001 From: Mark Wagie Date: Mon, 18 Jan 2021 10:55:14 -0700 Subject: [PATCH] Update Makefile --- src/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Makefile b/src/Makefile index cf71c05..21fa618 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,7 +9,6 @@ APP_GUI_BINARY="wihotspot-gui" PREFIX=/usr BINDIR=$(PREFIX)/bin -APP_DIR=$(PREFIX)/share/$(APP_NAME) ODIR=../build @@ -42,15 +41,13 @@ wihotspot-gui: $(OBJ) $(CC) -o $(ODIR)/$@ $^ $(CFLAGS) $(LIBS) install: $(ODIR)/wihotspot-gui - mkdir -p $(DESTDIR)$(APP_DIR) - install -Dm644 desktop/hotspot.png $(DESTDIR)$(APP_DIR)/hotspot.png - install -Dm644 desktop/wifihotspot.desktop $(DESTDIR)$(APP_DIR)/$(APP_NAME).desktop + install -Dm644 desktop/hotspot.png $(DESTDIR)$(PREFIX)/share/pixmaps/wihotspot.png install -Dm644 desktop/wifihotspot.desktop $(DESTDIR)$(PREFIX)/share/applications/$(APP_NAME).desktop install -Dm755 $(ODIR)/wihotspot-gui $(DESTDIR)$(BINDIR)/$(APP_GUI_BINARY) cd scripts && $(MAKE) install uninstall: - rm -rf $(DESTDIR)$(APP_DIR) + rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/wihotspot.png rm -f $(DESTDIR)$(PREFIX)/share/applications/$(APP_NAME).desktop rm -f $(DESTDIR)$(BINDIR)/$(APP_GUI_BINARY) cd scripts && $(MAKE) uninstall @@ -64,4 +61,4 @@ clean-old: clean: rm -f $(ODIR)/*.o rm -f ui/$(BUILT_SRC) - rm -f $(ODIR)/wihotspot-gui \ No newline at end of file + rm -f $(ODIR)/wihotspot-gui