conflict resolve

1 files changed, 3 insertions, 3 deletions

diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt
index d2ec61a0a93..b3aaa75d2c2 100644
--- a/etc/srecode/ede-autoconf.srt
+++ b/etc/srecode/ede-autoconf.srt
@@ -1,6 +1,6 @@
 ;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE.
 ;;
-;; Copyright (C) 2010 Eric M. Ludlam
+;; Copyright (C) 2010, 2013 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 ;;
@@ -26,7 +26,7 @@ set application "ede"
 
 context file
 
-template ede-empty
+template ede-empty :project
 "Start a new EDE generated configure.in/ac file."
 ----
 {{comment_prefix}} Automatically Generated/Maintained {{FILE}} by EDE.
@@ -40,7 +40,7 @@ template ede-empty
 {{comment_prefix}}
 {{comment_prefix}} Process this file with autoconf to produce a configure script
 
-AC_INIT({{TEST_FILE}})
+AC_INIT({{PROJECT_NAME}}, {{PROJECT_VERSION}})
 AM_INIT_AUTOMAKE([{{PROGRAM}}], 0)
 AM_CONFIG_HEADER(config.h)