diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..caeec17 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.flatpak-builder diff --git a/Makefile b/Makefile index b11b16e..43da3fe 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ CC = gcc +DESTDIR = /usr/bin CFLAGS = -Wall -Wextra -g PKG_CONFIG = pkg-config GTK_LIBS = $(shell $(PKG_CONFIG) --libs gtk+-3.0) -WEBKIT_LIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.1) +WEBKIT_LIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0) LIBS = $(GTK_LIBS) $(WEBKIT_LIBS) -INCLUDES = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 webkit2gtk-4.1) +INCLUDES = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 webkit2gtk-4.0) SRCS = pageburger.c OBJS = $(SRCS:.c=.o) @@ -22,3 +23,7 @@ $(TARGET): $(OBJS) clean: rm -f $(OBJS) $(TARGET) + +install: + mkdir -p $(DESTDIR) + cp pageburger $(DESTDIR) diff --git a/install.sh b/install.sh deleted file mode 100755 index 5ef2426..0000000 --- a/install.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -make -cp pageburger /usr/bin/ diff --git a/org.hectabit.Pageburger.json b/org.hectabit.Pageburger.json index 460720d..a28c2d0 100644 --- a/org.hectabit.Pageburger.json +++ b/org.hectabit.Pageburger.json @@ -3,7 +3,7 @@ "runtime": "org.gnome.Platform", "runtime-version": "45", "sdk": "org.gnome.Sdk", - "command": "pageburger", + "command": "/app/bin/pageburger", "modules": [ { "name": "PageBurger", @@ -16,7 +16,7 @@ } ], "build-commands": [ - "./install.sh" + "make install DESTDIR=/app/bin/" ] } ]