[cpp-log4shib] 11/26: Merge branch 'bug/macro-dir'

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to annotated tag debian/1.0.4-1
in repository cpp-log4shib.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=658d4f4a1c8df5950b7430a0bf25a6733b49a276

commit 658d4f4a1c8df5950b7430a0bf25a6733b49a276
Merge: 327a9a6 c28098e
Author: Russ Allbery <rra at stanford.edu>
AuthorDate: Tue Jun 5 19:38:06 2012 -0700

    Merge branch 'bug/macro-dir'

 Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --cc Makefile.am
index 95d58f9,9d97ceb..ae9ce8d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,10 -1,12 +1,12 @@@
+ ACLOCAL_AMFLAGS = -I m4
+ 
  if DOC
 -SUBDIRS = debian msvc6 msvc8 msvc9 bcb5 config src include tests doc 
 +SUBDIRS = msvc6 msvc8 msvc9 bcb5 config src include tests doc 
  else
 -SUBDIRS = debian msvc6 msvc8 msvc9 bcb5 config src include tests
 +SUBDIRS = msvc6 msvc8 msvc9 bcb5 config src include tests
  endif
  
 -DIST_SUBDIRS = debian msvc6 msvc8 msvc9 bcb5 openvms config src include doc tests
 +DIST_SUBDIRS = msvc6 msvc8 msvc9 bcb5 openvms config src include doc tests
  
  bin_SCRIPTS = log4shib-config
  

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.