Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions M2/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -508,17 +508,6 @@ AC_SUBST([GIT_DESCRIPTION],
AC_SUBST([GIT_BRANCH],
[`$GIT branch --show-current`])

AC_SUBST(DEB,no)
AC_ARG_ENABLE(deb, AS_HELP_STRING(--enable-deb,prepare a *.deb package (for debian, ubuntu, ...)), DEB=$enableval)
if test "$DEB" = yes
then if test "$OPTIMIZE" = no
then AC_MSG_ERROR([--disable-optimize and --enable-deb both specified])
fi
if test "$DEBUG" = yes
then AC_MSG_ERROR([--enable-debug and --enable-deb both specified])
fi
fi

AC_SUBST(FREEBSD,no)
AC_ARG_ENABLE(freebsd, AS_HELP_STRING(--enable-freebsd,prepare a package file for freebsd), FREEBSD=$enableval)
if test "$FREEBSD" = yes
Expand Down Expand Up @@ -1958,10 +1947,6 @@ fi
# Here we insert autoconf's default values so we can compute the relative locations in the directory tree
test "$prefix" || prefix=/usr/local

# for some distributions, we know what the prefix should be:
test "$DEB" = yes && test "$prefix" != /usr &&
AC_MSG_ERROR(--enable-deb specified and --prefix not set to /usr)

if test "$prefix" != /usr/local
then test "$FREEBSD" = yes && AC_MSG_ERROR(--enable-freebsd specified and --prefix not set to /usr/local)
fi
Expand Down
9 changes: 2 additions & 7 deletions M2/distributions/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,20 @@ include ../include/config.Makefile
VPATH = @srcdir@
all:
.PHONY: all
$(foreach d,top tar deb freebsd dmg, \
$(foreach d,top tar freebsd dmg, \
$(eval .PHONY: all-in-$d) \
$(eval all-in-$d:; + $(MAKE) -C $d all))
ifeq "@M2TARFILE@" "yes"
all: all-in-tar
endif
ifeq "@DEB@" "yes"
all: all-in-deb
check: check-in-deb
check-in-deb:; + $(MAKE) -C deb check
endif
ifeq "@FREEBSD@" "yes"
all: all-in-freebsd
endif
ifeq "@DMG@" "yes"
all: all-in-dmg
endif
$(foreach t,clean distclean, \
$(foreach d,dmg deb freebsd tar top install, $(eval \
$(foreach d,dmg freebsd tar top install, $(eval \
.PHONY: $t $t-in-$d \
)$(eval \
$t: $t-in-$d \
Expand Down
191 changes: 0 additions & 191 deletions M2/distributions/deb/Makefile.in

This file was deleted.

117 changes: 0 additions & 117 deletions M2/distributions/deb/README

This file was deleted.

Loading
Loading