Changeset 4414

Show
Ignore:
Timestamp:
11/09/06 16:51:19 (2 years ago)
Author:
morris
Message:

Fix build system

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • wire/trunk/Makefile.in

    r4413 r4414  
    5555        for subdir in $$list; do \ 
    5656                target=`echo $@ | sed s/-recursive//`; \ 
    57                 (cd $$subdir && $(MAKE) $$target) || exit 1; \ 
     57                (cd $$subdir && $(MAKE) -e $$target) || exit 1; \ 
    5858        done 
    5959 
    …… 
    114114        done 
    115115 
    116         $(SHELL) -ec "cd wire-$(WR_VERSION) && WR_MAINTAINER=0 $(MAKE) -e distclean scmclean" 
     116        $(SHELL) -ec "cd wire-$(WR_VERSION) && WR_MAINTAINER=0 WI_MAINTAINER=0 $(MAKE) -e distclean scmclean" 
    117117 
    118118        tar -czf wire-$(WR_VERSION).tar.gz wire-$(WR_VERSION) 
    …… 
    121121clean: clean-recursive 
    122122        rm -f $(objdir)/wire/*.o 
     123        rm -f $(objdir)/*.d 
     124        rm -f $(rundir)/wire 
    123125 
    124126distclean: clean distclean-recursive 

  • wire/trunk/configure

    r4379 r4414  
    29272927        objdir="obj" 
    29282928 
    2929         wr_libwired_objdir="$(pwd)/obj" 
     2929        wr_libwired_objdir="../obj" 
    29302930fi 
    29312931 
    …… 
    29462946        rundir="run" 
    29472947 
    2948         wr_libwired_rundir="$(pwd)/run/libwired" 
     2948        wr_libwired_rundir="../run/libwired" 
    29492949fi 
    29502950 

  • wire/trunk/configure.in

    r4379 r4414  
    8787else 
    8888        AC_SUBST([objdir], ["obj"]) 
    89         wr_libwired_objdir="$(pwd)/obj" 
     89        wr_libwired_objdir="../obj" 
    9090fi 
    9191 
    …… 
    9999else 
    100100        AC_SUBST([rundir], ["run"]) 
    101         wr_libwired_rundir="$(pwd)/run/libwired" 
     101        wr_libwired_rundir="../run/libwired" 
    102102fi 
    103103