Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › d152686
src: Fix install target
Dag-Erling Smørgrav committed 9 days ago
commit d15268605483e701ad90fe8937d2f71d0bd8d26e
parent 411c4ed
2 files changed +6 -7
modified mk/prog.mk
@@ -4,6 +4,8 @@ PROGNAME= $(PROG)$(EXEEXT)


CLEAN_FILES+=	$(PROGNAME) $(OBJS) $(DEPFILES)
+ 
.PHONY: all install install-prog distclean
+ 


all: $(PROGNAME)



$(PROGNAME): $(OBJS)
modified src/Makefile.in
@@ -104,6 +104,9 @@ STATIC_LDFLAGS+= -lbz2 -lz -llzma @ZSTDLIB@


VPATH=	$(top_srcdir)/src
+ 
# These programs go in sbin
+ 
bindir=	$(sbindir)
+ 


include $(MK)/prog.mk



@if HAVE_STATIC
@@ -113,6 +116,7 @@ install: install-static
pkg-static: $(OBJS) $(top_builddir)/libpkg/libpkg_flat.a

	$(CC) -o $@ $(OBJS) $(STATIC_ARG) $(LDFLAGS) $(STATIC_LDFLAGS)
+ 
.PHONY: install-static

install-static: pkg-static

	install -d -m 755 $(DESTDIR)$(sbindir)

	install -m 755 pkg-static $(DESTDIR)$(sbindir)/pkg-static
@@ -121,10 +125,3 @@ install-static: pkg-static
${OBJS}: $(top_builddir)/pkg_config.h



$(PROG): $(top_builddir)/libpkg/libpkg_flat.a
-
- 
install: $(PROG)
- 
	install -d -m 755 $(DESTDIR)$(sbindir)
- 
	install -m 755 pkg $(DESTDIR)$(sbindir)/pkg
- 
	install -d -m 755 $(DESTDIR)$(etcdir)
- 
	install -m 644 $(top_srcdir)/src/pkg.conf.sample $(DESTDIR)$(etcdir)/
-