From e131a2ed68ba6a8eb64fc03fe968575bac8013b6 Mon Sep 17 00:00:00 2001 From: Nathan Phillip Brink Date: Tue, 28 Feb 2012 06:40:18 +0000 Subject: [PATCH] During installation, don't unconditionally create an empty `modules-old' directory. --- Makefile.in | 4 +--- modules/Makefile.in | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 90c861c..a85a707 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,6 +46,7 @@ CFLAGS = @CFLAGS@ # the system one. #CFLAGS= -DNDEBUG -g -O2 -D"FD_SETSIZE=1024" SHELL=/bin/sh +# `extensions' must be after `modules' for proper creation of $(moduledir). SUBDIRS=libratbox modules extensions src tools ssld bandb doc help CLEANDIRS = ${SUBDIRS} RSA_FILES=rsa_respond/README rsa_respond/respond.c rsa_respond/Makefile @@ -127,9 +128,6 @@ install-mkdirs: -@if test ! -d $(DESTDIR)$(mandir); then \ mkdir $(DESTDIR)$(mandir); \ fi - -@if test ! -d $(DESTDIR)$(moduledir); then \ - mkdir $(DESTDIR)$(moduledir); \ - fi -@if test ! -d $(DESTDIR)$(helpdir); then \ mkdir $(DESTDIR)$(helpdir); \ fi diff --git a/modules/Makefile.in b/modules/Makefile.in index fd77444..bd8b4b8 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -153,9 +153,6 @@ libmodules.a: $(S_OBJS) static_modules.o install-mkdirs: @echo "ircd: setting up modular directory structure" - -@if test ! -d $(DESTDIR)$(moduledir); then \ - mkdir $(DESTDIR)$(moduledir); \ - fi -@if test -d $(DESTDIR)$(moduledir)-old; then \ rm -rf $(DESTDIR)$(moduledir)-old; \ fi