diff --git a/Makefile b/Makefile index 81cb9ae..2a8348a 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,9 @@ export VERSION := 0 export SUBVERSION := 8 export MINORVERSION := 2-SNAPSHOT +#export PREFIX := /usr +export PREFIX ?= /usr/local + all: nethogs decpcap_test test $(MAKE) -C src -f MakeApp.mk $@ $(MAKE) -C src -f MakeLib.mk $@ @@ -16,13 +19,16 @@ check: install: $(MAKE) -C src -f MakeApp.mk $@ $(MAKE) -C src -f MakeLib.mk $@ + $(MAKE) -C doc $@ install_dev: $(MAKE) -C src -f MakeLib.mk $@ + $(MAKE) -C doc $@ uninstall: $(MAKE) -C src -f MakeApp.mk $@ $(MAKE) -C src -f MakeLib.mk $@ + $(MAKE) -C doc $@ nethogs: $(MAKE) -C src -f MakeApp.mk $@ diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 0000000..33fbab3 --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,11 @@ +all: + +man8 := $(PREFIX)/share/man/man8 + +install: nethogs.8 + install -d -m 755 $(DESTDIR)$(man8) + install -m 644 nethogs.8 $(DESTDIR)$(man8) + +uninstall: + rm $(DESTDIR)$(man8)/nethogs.8 || true + diff --git a/src/MakeApp.mk b/src/MakeApp.mk index f0d8040..68df097 100644 --- a/src/MakeApp.mk +++ b/src/MakeApp.mk @@ -1,8 +1,4 @@ -#prefix := /usr -prefix := /usr/local - -sbin := $(prefix)/sbin -man8 := $(prefix)/share/man/man8 +sbin := $(PREFIX)/sbin all: nethogs decpcap_test @@ -21,19 +17,16 @@ NCURSES_LIBS?=-lncurses check: @echo "Not implemented" -install: nethogs nethogs.8 +install: nethogs install -d -m 755 $(DESTDIR)$(sbin) install -m 755 nethogs $(DESTDIR)$(sbin) - install -d -m 755 $(DESTDIR)$(man8) - install -m 644 nethogs.8 $(DESTDIR)$(man8) @echo @echo "Installed nethogs to $(DESTDIR)$(sbin)" @echo @echo "You might have to add this directory to your PATH and/or refresh your shells' path cache with a command like 'hash -r'." uninstall: - rm $(DESTDIR)$(sbin)/nethogs - rm $(DESTDIR)$(man8)/nethogs.8 + rm $(DESTDIR)$(sbin)/nethogs || true nethogs: main.cpp nethogs.cpp $(OBJS) $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) main.cpp $(OBJS) -o nethogs -lpcap -lm ${NCURSES_LIBS} -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" diff --git a/src/MakeLib.mk b/src/MakeLib.mk index 2a39a06..42c9d1e 100644 --- a/src/MakeLib.mk +++ b/src/MakeLib.mk @@ -2,9 +2,8 @@ LIBRARY=libnethogs.so LIBNAME=$(LIBRARY).$(LIBVERSION).$(LIBSUBVERSION).$(LIBMINORVERSION) SO_NAME=$(LIBRARY).$(LIBVERSION) -prefix := /usr/local -libdir := $(prefix)/lib -incdir := $(prefix)/include +libdir := $(PREFIX)/lib +incdir := $(PREFIX)/include all: $(LIBNAME) libnethogs.a @@ -45,7 +44,7 @@ install: $(LIBNAME) install -d -m 755 $(DESTDIR)$(libdir) install -m 755 $(LIBNAME) $(DESTDIR)$(libdir) @echo "Installed $(LIBNAME) to $(DESTDIR)$(libdir)" - ldconfig + ldconfig || true install_dev: install @ln -f -s $(DESTDIR)$(libdir)/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBRARY) @@ -54,14 +53,14 @@ install_dev: install install -d -m 755 $(DESTDIR)$(incdir) install -m 755 libnethogs.h $(DESTDIR)$(incdir) @echo "Installed libnethogs.h to $(DESTDIR)$(incdir)" - ldconfig + ldconfig || true uninstall: rm -f $(DESTDIR)$(libdir)/$(LIBNAME) rm -f $(DESTDIR)$(libdir)/$(LIBRARY) rm -f $(DESTDIR)$(libdir)/libnethogs.a rm -f $(DESTDIR)$(incdir)/libnethogs.h - ldconfig + ldconfig || true $(LIBNAME): $(OBJS) $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -o $@ -lpcap