--- rpl/tools/Attic/Makefile.in 2010/04/20 12:55:19 1.13 +++ rpl/tools/Attic/Makefile.in 2010/06/20 17:06:57 1.20 @@ -99,12 +99,12 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LATEX = @LATEX@ LDFLAGS = @LDFLAGS@ -LIBMTMALLOC = @LIBMTMALLOC@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MALLOC = @MALLOC@ MKDIR_P = @MKDIR_P@ MOTIF_SUPPORT = @MOTIF_SUPPORT@ MYSQL_SUPPORT = @MYSQL_SUPPORT@ @@ -390,7 +390,11 @@ all: \mv -f $$TMP @UNITS@/Makefile @list='$(subdirs)'; for subdir in $$list; do \ echo "Making $@ in $$subdir"; \ - $(MAKE) -C $$subdir $@ ; \ + if [ $$subdir = @OPENSSL@ ]; then \ + $(MAKE) -C $$subdir -j1 $@; \ + else \ + $(MAKE) -C $$subdir $@; \ + fi; \ done; if [ ! -f @OPENSSL@/tests_success ]; then \ (cd @OPENSSL@ && $(MAKE) test && touch tests_success); \ @@ -407,9 +411,11 @@ clean distclean: $(MAKE) -C $$subdir -j1 $@; \ else \ $(MAKE) -C $$subdir $@; \ - fi; + fi; \ done; - \rm @OPENSSL@/tests_success + if [ -f @OPENSSL@/tests_success ]; then \ + \rm -f @OPENSSL@/tests_success; \ + fi install: all $(mkinstalldirs) $(DESTDIR)$(bindir) @@ -427,7 +433,7 @@ install: all $(INSTALL_DATA) $(FILE)/magic/magic.mgc \ $(DESTDIR)$(datadir)/rplfiles.mgc $(INSTALL_PROGRAM) $(FILE)/src/rplfile$(EXEEXT) \ - $(DESTDIR)$(bindir)/rplfile$(EXEEXT); + $(DESTDIR)$(bindir)/rplfile$(EXEEXT) uninstall: \rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \