From 28a7e628b8b5411441b178480e1dcfa40e9930c8 Mon Sep 17 00:00:00 2001 From: imbert Date: Wed, 20 Mar 2013 10:34:52 +0000 Subject: remplacement de mkdirhier par mkdir -p --- debian/changelog | 39 ++++++++++++++++++++++----------------- src/Makefile | 18 +++++++++--------- src/Makefile.mingw | 10 +++++----- tools/Makefile | 4 ++-- tools/Makefile.mingw | 4 ++-- tools/Makefile.osx | 4 ++-- 6 files changed, 42 insertions(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index 549d092..f544838 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ +ivy-c (3.11.10) unstable; urgency=low + + * mkdirhier replaced by mkdir -p in all Makefile(s) + + -- Jean-Paul Imbert Fri, 15 March 2013 10:03:00 +0100 + ivy-c (3.11.9) unstable; urgency=low * headers path modification in ivytestreplay.c - + -- Alexandre Bustico Wed, 21 December 2011 10:03:00 +0100 - + ivy-c (3.11.8) unstable; urgency=low * correct broadcast adress for loopback (not the same beetween linux/windows and osx) @@ -11,14 +17,14 @@ ivy-c (3.11.8) unstable; urgency=low * correct OSX Makefile to set correct dylib path on executable at install * make ivy-c compilable by a c++ compiler * add fixes to remove all gcc warning message - + -- Alexandre Bustico Mon, 27 Janury 2010 13:43:00 +0100 ivy-c (3.11.7) unstable; urgency=low * copy string buffer for message ready instead of referencing it since we have no clue if this buffer will remain valid atfer the caller calls init * function ivyTerminate dealloc allocated string - + -- Alexandre Bustico Mon, 6 Jul 2009 16:43:00 +0200 ivy-c (3.11.6) unstable; urgency=low @@ -26,13 +32,13 @@ ivy-c (3.11.6) unstable; urgency=low * desactivation of the nagle buffering for TCP sockets, since ivy is most of the time used to send events, we will priviligiate lag over throughtput - + -- Alexandre Bustico Mon, 6 Jul 2009 16:43:00 +0200 - + ivy-c (3.11.5) unstable; urgency=low * fix double free error in delAllRegexpsFromDictionary - + -- Alexandre Bustico Mon, 16 Oct 2008 12:30:00 +0200 ivy-c (3.11.4) unstable; urgency=low @@ -40,7 +46,7 @@ ivy-c (3.11.4) unstable; urgency=low * fix again timer.c (thanks again to brno ivy dev team) so that timer could be removed within the callback * make the lib and api more robust by adding const where they should be * compile with -Wall and eliminate remaining warnings - + -- Alexandre Bustico Mon, 19 May 2008 17:30:00 +0200 ivy-c (3.11.3) unstable; urgency=low @@ -48,20 +54,20 @@ ivy-c (3.11.3) unstable; urgency=low * fix timer.c (thanks to brno ivy dev team), and ivydebug.h * add __attribute__ gcc hooks which permit to emit warning when format and arguments of bindmessage and sendmessage aren't concordant. - + -- Alexandre Bustico Tue, 14 May 2008 11:00:00 +0200 - + ivy-c (3.11.2) unstable; urgency=low * fix makefile for openmp lib and tools - + -- Alexandre Bustico Tue, 6 May 2008 15:32:54 +0100 ivy-c (3.11.1) unstable; urgency=low * fix a bug with the behavior of send system call in non blocking mode in some rare case * simplify ivythroutput and his fileset - + -- Alexandre Bustico Wed, 8 Apr 2008 15:32:54 +0100 ivy-c (3.11.0) unstable; urgency=low @@ -70,19 +76,19 @@ ivy-c (3.11.0) unstable; urgency=low fifo, this fix some deadlock problems when lot of agents with numerous regexp binding are on the same bus. * little (ascendant compatible) api change * fix for numerous bugs - + -- Alexandre Bustico Wed, 26 Mar 2008 15:32:54 +0100 ivy-c (3.10.0-3) unstable; urgency=low * revert accidentally commited modif - + -- Alexandre Bustico Wed, 08 Feb 2008 10:32:54 +0100 ivy-c (3.10.0-2) unstable; urgency=low * fix makefile for non omp target - + -- Alexandre Bustico Wed, 08 Feb 2008 10:32:54 +0100 ivy-c (3.10.0-1) unstable; urgency=low @@ -90,7 +96,7 @@ ivy-c (3.10.0-1) unstable; urgency=low * change Makefile to get around a debian Bug : debian pcrecpp package is broken, (as debian itself) * a repertory testivy with test file for the ivythroughput test tool - + -- Alexandre Bustico Wed, 06 Feb 2008 17:17:54 +0100 ivy-c (3.10.0) unstable; urgency=low @@ -100,7 +106,6 @@ ivy-c (3.10.0) unstable; urgency=low * experimental parralelized version for performance optimisation (use and need openmp) which scale well for regexp matching on multicore/multi processor gear. - -- Alexandre Bustico Wed, 06 Feb 2008 17:17:54 +0100 diff --git a/src/Makefile b/src/Makefile index b9acb58..aa5f4e6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -247,8 +247,8 @@ clean: installlibs: static-libs shared-libs - test -d $(DESTDIR)$(PREFIX)$(LIB) || mkdirhier $(DESTDIR)$(PREFIX)$(LIB) - -test -d $(DESTDIR)$(X11_PREFIX)$(LIB) || mkdirhier $(DESTDIR)$(X11_PREFIX)$(LIB) + test -d $(DESTDIR)$(PREFIX)$(LIB) || mkdir -p $(DESTDIR)$(PREFIX)$(LIB) + -test -d $(DESTDIR)$(X11_PREFIX)$(LIB) || mkdir -p $(DESTDIR)$(X11_PREFIX)$(LIB) install -m644 libivy.a $(DESTDIR)$(PREFIX)$(LIB) install -m644 libgivy.a $(DESTDIR)$(PREFIX)$(LIB) @@ -263,14 +263,14 @@ installlibs: static-libs shared-libs install -m644 libglibivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB) installlibs_omp: static-libs shared-libs - test -d $(DESTDIR)$(PREFIX)$(LIB) || mkdirhier $(DESTDIR)$(PREFIX)$(LIB) - -test -d $(DESTDIR)$(X11_PREFIX)$(LIB) || mkdirhier $(DESTDIR)$(X11_PREFIX)$(LIB) + test -d $(DESTDIR)$(PREFIX)$(LIB) || mkdir -p $(DESTDIR)$(PREFIX)$(LIB) + -test -d $(DESTDIR)$(X11_PREFIX)$(LIB) || mkdir -p $(DESTDIR)$(X11_PREFIX)$(LIB) install -m644 libivy_omp.a $(DESTDIR)$(PREFIX)$(LIB) install -m644 libivy_omp.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB) includes: - test -d $(DESTDIR)$(PREFIX)/include/Ivy || mkdirhier $(DESTDIR)$(PREFIX)/include/Ivy + test -d $(DESTDIR)$(PREFIX)/include/Ivy || mkdir -p $(DESTDIR)$(PREFIX)/include/Ivy install -m644 ivy.h $(DESTDIR)$(PREFIX)/include/Ivy/ install -m644 ivybind.h $(DESTDIR)$(PREFIX)/include/Ivy/ install -m644 ivybuffer.h $(DESTDIR)$(PREFIX)/include/Ivy/ @@ -306,15 +306,15 @@ installbins_omp: installdocs: - test -d $(DESTDIR)$(PREFIX)/share/doc/ivy-c || mkdirhier $(DESTDIR)$(PREFIX)/share/doc/ivy-c + test -d $(DESTDIR)$(PREFIX)/share/doc/ivy-c || mkdir -p $(DESTDIR)$(PREFIX)/share/doc/ivy-c for f in `find ../doc/*.html -type f -maxdepth 1`; do \ install -m 644 $$f $(DESTDIR)$(PREFIX)/share/doc/ivy-c; \ done - test -d $(DESTDIR)$(PREFIX)/man/man1 || mkdirhier $(DESTDIR)$(PREFIX)/man/man1 + test -d $(DESTDIR)$(PREFIX)/man/man1 || mkdir -p $(DESTDIR)$(PREFIX)/man/man1 for f in `find ../doc/*.1 -type f -maxdepth 1`; do \ install -m 644 $$f $(DESTDIR)$(PREFIX)/man/man1; \ done - test -d $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples || mkdirhier $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples + test -d $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples || mkdir -p $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples install -m 644 version.h $(DESTDIR)$(PREFIX)/share/doc/ivy-c/copyright install -m 644 ../examples/motifButtonIvy.c $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples install -m 644 ../examples/testUnbind.c $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples @@ -335,5 +335,5 @@ pkgconf: sed -e 's,@PREFIX@,$(PREFIX),; s,@DESTDIR@,$(DESTDIR),; s,@MAJOR@,$(MAJOR),; s,@MINOR@,$(MINOR),; s,@PCREINC@,$(PCREINC),; s,@REGEXP@,$(REGEXP),; s,@PCRELIB@,$(PCRELIB),; s,@EXTRALIB@,$(EXTRALIB),' ivy-glib.pc.in > ivy-glib.pc installpkgconf: - test -d $(DESTDIR)$(PREFIX)/lib/pkgconfig || mkdirhier $(DESTDIR)$(PREFIX)/lib/pkgconfig + test -d $(DESTDIR)$(PREFIX)/lib/pkgconfig || mkdir -p $(DESTDIR)$(PREFIX)/lib/pkgconfig install -m 644 ivy-glib.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig diff --git a/src/Makefile.mingw b/src/Makefile.mingw index 3080ba7..1e1e24a 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -159,9 +159,9 @@ clean: @(cd $(TOOLS_DIR) && $(MAKE) -f Makefile.mingw clean) installlibs: static-libs shared-libs - test -d $(PREFIX)/usr/lib || mkdirhier $(PREFIX)/usr/lib - test -d $(PREFIX)/usr/X11R6/lib || mkdirhier $(PREFIX)/usr/X11R6/lib - test -d $(PREFIX)/usr/include || mkdirhier $(PREFIX)/usr/include + test -d $(PREFIX)/usr/lib || mkdir -p $(PREFIX)/usr/lib + test -d $(PREFIX)/usr/X11R6/lib || mkdir -p $(PREFIX)/usr/X11R6/lib + test -d $(PREFIX)/usr/include || mkdir -p $(PREFIX)/usr/include install -m644 libivy.a $(PREFIX)/usr/lib install -m644 libgivy.a $(PREFIX)/usr/lib install -m644 libxtivy.a $(PREFIX)/usr/X11R6/lib @@ -194,11 +194,11 @@ installbins: @(cd $(TOOLS_DIR) && $(MAKE) -f Makefile.mingw install) installdocs: - test -d $(PREFIX)/usr/doc/ivy-c || mkdirhier $(PREFIX)/usr/doc/ivy-c + test -d $(PREFIX)/usr/doc/ivy-c || mkdir -p $(PREFIX)/usr/doc/ivy-c for f in `find ../doc/*.html -type f -maxdepth 1`; do \ install -m 644 $$f $(PREFIX)/usr/doc/ivy-c; \ done - test -d $(PREFIX)/usr/man/man1 || mkdirhier $(PREFIX)/usr/man/man1 + test -d $(PREFIX)/usr/man/man1 || mkdir -p $(PREFIX)/usr/man/man1 for f in `find ../doc/*.1 -type f -maxdepth 1`; do \ install -m 644 $$f $(PREFIX)/usr/man/man1; \ done diff --git a/tools/Makefile b/tools/Makefile index 48c85bc..22fa3e9 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -61,11 +61,11 @@ ivyglutprobe: ivyglutprobe.o ../src/libglutivy.a $(CC) -o ivyglutprobe ivyglutprobe.o -L. $(GLUTLIB) -lglutivy $(PCRELIB) $(EXTRALIB installbins: $(TARGETS) - test -d $(DESTDIR)$(PREFIX)/bin || mkdirhier $(DESTDIR)$(PREFIX)/bin + test -d $(DESTDIR)$(PREFIX)/bin || mkdir -p $(DESTDIR)$(PREFIX)/bin install -m755 ivyprobe $(DESTDIR)$(PREFIX)/bin installbins_omp: $(OMP_TARGET) - test -d $(DESTDIR)$(PREFIX)/bin || mkdirhier $(DESTDIR)$(PREFIX)/bin + test -d $(DESTDIR)$(PREFIX)/bin || mkdir -p $(DESTDIR)$(PREFIX)/bin install -m755 ivyprobe_omp $(DESTDIR)$(PREFIX)/bin install: installbins diff --git a/tools/Makefile.mingw b/tools/Makefile.mingw index 51c6bbb..3137387 100644 --- a/tools/Makefile.mingw +++ b/tools/Makefile.mingw @@ -52,8 +52,8 @@ clean: install: installbins installbins: commands - test -d $(PREFIX)/usr/bin || mkdirhier $(PREFIX)/usr/bin - test -d $(PREFIX)/usr/X11R6/bin || mkdirhier $(PREFIX)/usr/X11R6/bin + test -d $(PREFIX)/usr/bin || mkdir -p $(PREFIX)/usr/bin + test -d $(PREFIX)/usr/X11R6/bin || mkdir -p $(PREFIX)/usr/X11R6/bin install -m755 ivyprobe $(PREFIX)/usr/bin # install -m755 ivyglutprobe $(PREFIX)/usr/X11R6/bin diff --git a/tools/Makefile.osx b/tools/Makefile.osx index ab3ce10..7ce66ab 100644 --- a/tools/Makefile.osx +++ b/tools/Makefile.osx @@ -49,11 +49,11 @@ ivyperf: ivyperf.o ../src/libivy.a installbins: $(TARGETS) - test -d $(DESTDIR)$(PREFIX)/bin || mkdirhier $(DESTDIR)$(PREFIX)/bin + test -d $(DESTDIR)$(PREFIX)/bin || mkdir -p $(DESTDIR)$(PREFIX)/bin install -m755 ivyprobe $(DESTDIR)$(PREFIX)/bin installbins_omp: $(OMP_TARGET) - test -d $(DESTDIR)$(PREFIX)/bin || mkdirhier $(DESTDIR)$(PREFIX)/bin + test -d $(DESTDIR)$(PREFIX)/bin || mkdir -p $(DESTDIR)$(PREFIX)/bin install -m755 ivyprobe_omp $(DESTDIR)$(PREFIX)/bin install: installbins -- cgit v1.1