diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | macros/Makefile.am (renamed from macros2/Makefile.am) | 0 | ||||
| -rw-r--r-- | macros/mate-autogen (renamed from macros2/mate-autogen) | 2 | ||||
| -rw-r--r-- | macros/mate-common.m4 (renamed from macros2/mate-common.m4) | 0 | ||||
| -rw-r--r-- | macros/mate-compiler-flags.m4 (renamed from macros2/mate-compiler-flags.m4) | 0 |
7 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 387e921..ee4791d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = macros2 doc-build +SUBDIRS = macros doc-build EXTRA_DIST = \ autogen.sh \ @@ -14,5 +14,5 @@ PKG_NAME="mate-common" exit 1 } -. $srcdir/macros2/mate-autogen +. $srcdir/macros/mate-autogen diff --git a/configure.in b/configure.in index 7de3689..7951b65 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ AC_PREREQ(2.54) AC_INIT([mate-common], [1.2.2], [https://github.com/mate-desktop/mate-common]) -AC_CONFIG_SRCDIR([macros2/mate-autogen]) +AC_CONFIG_SRCDIR([macros/mate-autogen]) AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2]) @@ -16,7 +16,7 @@ AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([ Makefile mate-common.spec -macros2/Makefile +macros/Makefile doc-build/Makefile doc-build/mate-doc-common ]) diff --git a/macros2/Makefile.am b/macros/Makefile.am index a94ad27..a94ad27 100644 --- a/macros2/Makefile.am +++ b/macros/Makefile.am diff --git a/macros2/mate-autogen b/macros/mate-autogen index 94b2ba1..46422e0 100644 --- a/macros2/mate-autogen +++ b/macros/mate-autogen @@ -247,7 +247,7 @@ check_m4macros() { fi } -# try to catch the case where the macros2/ directory hasn't been cleared out. +# try to catch the case where the macros/ directory hasn't been cleared out. forbid_m4macro mate-cxx-check.m4 want_libtool=false diff --git a/macros2/mate-common.m4 b/macros/mate-common.m4 index e3719f1..e3719f1 100644 --- a/macros2/mate-common.m4 +++ b/macros/mate-common.m4 diff --git a/macros2/mate-compiler-flags.m4 b/macros/mate-compiler-flags.m4 index 561f8d9..561f8d9 100644 --- a/macros2/mate-compiler-flags.m4 +++ b/macros/mate-compiler-flags.m4 |