Merge branch 'master' into 'master'
Fix Makefile and PKGBUILD for proper installation See merge request vojjvoda/fetchy!2
This commit is contained in:
commit
6b6c3bf0d2
2 changed files with 5 additions and 11 deletions
8
Makefile
8
Makefile
|
@ -12,11 +12,11 @@ clean:
|
||||||
-rm -f fetchy
|
-rm -f fetchy
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
mkdir -p $(PREFIX)/bin
|
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
||||||
cp -f fetchy $(PREFIX)/bin
|
cp -f fetchy $(DESTDIR)$(PREFIX)/bin
|
||||||
chmod 755 $(PREFIX)/bin/fetchy
|
chmod 755 $(DESTDIR)$(PREFIX)/bin/fetchy
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
-rm -f $(PREFIX)/bin/fetchy
|
-rm -f $(DESTDIR)$(PREFIX)/bin/fetchy
|
||||||
|
|
||||||
.PHONY: all install uninstall clean
|
.PHONY: all install uninstall clean
|
||||||
|
|
8
PKGBUILD
8
PKGBUILD
|
@ -27,15 +27,9 @@ validpgpkeys=()
|
||||||
build() {
|
build() {
|
||||||
cd fetchy
|
cd fetchy
|
||||||
make
|
make
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd fetchy
|
cd fetchy
|
||||||
mkdir -p ${pkgdir}/opt/${pkgname}
|
make DESTDIR="$pkgdir" PREFIX="/usr" install
|
||||||
cp -rf * ${pkgdir}/opt/${pkgname}
|
|
||||||
make install
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue