This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated discards 54d4ce312d1bff5105486a429ab4dc326408908b (commit) via 7b640614144c242d672abe372961ef1d2e64c1fd (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (54d4ce312d1bff5105486a429ab4dc326408908b) N -- N -- N (7b640614144c242d672abe372961ef1d2e64c1fd) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/7b640614144c242d672abe372961ef1d2e64c... commit 7b640614144c242d672abe372961ef1d2e64c1fd Author: Cyril Hrubis <metan@ucw.cz> Date: Fri Oct 18 23:48:07 2013 +0200 build: Add --mandir to configure and install.mk Now spiv is installed by make target rather than by the ugly install.sh script, also prepare for man page installation. Signed-off-by: Cyril Hrubis <metan@ucw.cz> diff --git a/Makefile b/Makefile index 33cc33c..2747b51 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ TOP_MAKE=1 ifneq ($(MAKECMDGOALS),install) SUBDIRS=include libs tests pylib demos build else -SUBDIRS=pylib +SUBDIRS=pylib demos endif libs: include diff --git a/configure b/configure index 5af836e..2e8164b 100755 --- a/configure +++ b/configure @@ -312,7 +312,8 @@ if __name__ == '__main__': 'prefix' : ['', 'Installation prefix'], 'bindir' : ['/usr/bin', 'Where to install binaries'], 'libdir' : ['', 'Where to install libraries'], - 'includedir' : ['/usr/include', 'Where to install headers']} + 'includedir' : ['/usr/include', 'Where to install headers'], + 'mandir' : ['/usr/share/man', 'Where to install man pages']} # # Library detection/enable disable diff --git a/demos/spiv/Makefile b/demos/spiv/Makefile index 80cfa29..4fc57aa 100644 --- a/demos/spiv/Makefile +++ b/demos/spiv/Makefile @@ -11,8 +11,12 @@ LDLIBS+=$(LDLIBS_LOADERS) $(LDLIBS_BACKENDS) APPS=spiv +INSTALL_BIN=spiv +#INSTALL_MAN=spiv.1 + spiv: cpu_timer.o image_cache.o image_list.o image_actions.o spiv_help.o image_loader.o cfg.o spiv_config.o include $(TOPDIR)/app.mk +include $(TOPDIR)/install.mk include $(TOPDIR)/post.mk diff --git a/install.mk b/install.mk new file mode 100644 index 0000000..689acda --- /dev/null +++ b/install.mk @@ -0,0 +1,34 @@ +ifdef DESTDIR +BIN_DIR=$(DESTDIR)$(bindir) +else +BIN_DIR=$(bindir) +endif + +ifdef DESTDIR +MAN_DIR=$(DESTDIR)$(mandir)/man1 +else +MAN_DIR=$(mandir)/man1 +endif + +install: +ifdef INSTALL_BIN +ifdef VERBOSE + install -d "$(BIN_DIR)" + for i in $(INSTALL_BIN); do install "$$i" "$(BIN_DIR)"; done +else + @install -d "$(BIN_DIR)" + @echo "MKDIR $(BIN_DIR)" + @for i in $(INSTALL_BIN); do echo "CP $$i $(MAN_DIR)"; install "$$i" "$(BIN_DIR)"; done +endif +endif + +ifdef INSTALL_MAN +ifdef VERBOSE + install -d "$(MAN_DIR)" + for i in $(INSTALL_MAN); do install "$$i" "$(MAN_DIR)"; done +else + @install -d "$(MAN_DIR)" + @echo "MKDIR $(MAN_DIR)" + @for i in $(INSTALL_MAN); do echo "CP $$i $(MAN_DIR)"; install "$$i" "$(MAN_DIR)"; done +endif +endif diff --git a/install.sh b/install.sh index 0b3020a..14c9835 100755 --- a/install.sh +++ b/install.sh @@ -40,4 +40,3 @@ done echo "INSTALL binaries" install -m 775 -d "$BIN_LOC" install -m 755 gfxprim-config "$BIN_LOC" -install -m 755 demos/spiv/spiv "$BIN_LOC" ----------------------------------------------------------------------- Summary of changes: install.mk | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 install.mk repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")