Skip to content

Commit

Permalink
Merged in robert-scheck/bgpdump/buildsys (pull request #27)
Browse files Browse the repository at this point in the history
  • Loading branch information
spakka committed Jun 2, 2019
2 parents 0b0a689 + 44b761a commit 2788dbe
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ PLEASE DO NOT E-MAIL INDIVIDUAL DEVELOPERS ABOUT
ISSUES, AS YOUR E-MAIL MAY BE LOST
==========================================================

2019-04-28 Robert Scheck <[email protected]>
* Use $(DESTDIR), $(INSTALL) and $(LDFLAGS) for downstreams
* Correct permissions for installed header files (*.h)

2019-03-06 Kevin White <[email protected]>
* Update Makefile.in to use $(DESTDIR) in the install stanza
* Transistion spec file to use %make_install, rather than %makeinstall
Expand Down
14 changes: 8 additions & 6 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ RANLIB = @RANLIB@

SYS_LIBS= @LIBS@

INSTALL = install

prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
Expand All @@ -29,10 +31,10 @@ libbgpdump.so: libbgpdump.a
$(COMPILE) $(LDFLAGS) -o libbgpdump.so $(LIB_O) $(SYS_LIBS)

example: example.c libbgpdump.a
$(COMPILE) -o example example.c libbgpdump.a $(SYS_LIBS)
$(COMPILE) $(LDFLAGS) -o example example.c libbgpdump.a $(SYS_LIBS)

bgpdump: bgpdump.c libbgpdump.a
$(COMPILE) -o bgpdump bgpdump.c libbgpdump.a $(SYS_LIBS)
$(COMPILE) $(LDFLAGS) -o bgpdump bgpdump.c libbgpdump.a $(SYS_LIBS)

check-clean:
rm -f test_out/*.bgp.gz
Expand All @@ -48,10 +50,10 @@ distclean: clean
rm -Rf $(PKG)

install: all
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)
install bgpdump $(DESTDIR)$(bindir)
install $(LIB_H) $(DESTDIR)$(includedir)
install libbgpdump.so libbgpdump.a $(DESTDIR)$(libdir)
$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)
$(INSTALL) bgpdump $(DESTDIR)$(bindir)
$(INSTALL) -m 0644 $(LIB_H) $(DESTDIR)$(includedir)
$(INSTALL) libbgpdump.so libbgpdump.a $(DESTDIR)$(libdir)

PKG=@PACKAGE_NAME@-@PACKAGE_VERSION@
dist:
Expand Down

0 comments on commit 2788dbe

Please sign in to comment.