Index: trunk/Makefile.am =================================================================== --- trunk/Makefile.am (revision 54454) +++ trunk/Makefile.am (working copy) @@ -32,31 +32,6 @@ rm -f $(top_distdir)/frontends/php/conf/zabbix.conf.php rm -rf $(top_distdir)/frontends/php/tests -dbschema_ibm_db2: - create/bin/gen_data.pl ibm_db2 > database/ibm_db2/data.sql - create/bin/gen_schema.pl ibm_db2 > database/ibm_db2/schema.sql - -dbschema_mysql: - create/bin/gen_data.pl mysql > database/mysql/data.sql - create/bin/gen_schema.pl mysql > database/mysql/schema.sql - -dbschema_oracle: - create/bin/gen_data.pl oracle > database/oracle/data.sql - create/bin/gen_schema.pl oracle > database/oracle/schema.sql - -dbschema_postgresql: - create/bin/gen_data.pl postgresql > database/postgresql/data.sql - create/bin/gen_schema.pl postgresql > database/postgresql/schema.sql - -dbschema_sqlite3: - create/bin/gen_data.pl sqlite3 > database/sqlite3/data.sql - create/bin/gen_schema.pl sqlite3 > database/sqlite3/schema.sql - -dbschema_c: - create/bin/gen_schema.pl c > src/libs/zbxdbhigh/dbschema.c - -dbschema: dbschema_ibm_db2 dbschema_mysql dbschema_oracle dbschema_postgresql dbschema_sqlite3 dbschema_c - gettext: frontends/php/locale/make_mo.sh Index: trunk/database/Makefile.am =================================================================== --- trunk/database/Makefile.am (revision 54454) +++ trunk/database/Makefile.am (working copy) @@ -16,3 +16,33 @@ sqlite3/data.sql \ sqlite3/images.sql \ sqlite3/schema.sql + +ibm_db2/data.sql: $(top_srcdir)/create/bin/gen_data.pl + $(top_srcdir)/create/bin/gen_data.pl ibm_db2 > ibm_db2/data.sql + +ibm_db2/schema.sql: $(top_srcdir)/create/bin/gen_data.pl + $(top_srcdir)/create/bin/gen_schema.pl ibm_db2 > ibm_db2/schema.sql + +mysql/data.sql: $(top_srcdir)/create/bin/gen_data.pl + $(top_srcdir)/create/bin/gen_data.pl mysql > mysql/data.sql + +mysql/schema.sql: $(top_srcdir)/create/bin/gen_data.pl + $(top_srcdir)/create/bin/gen_schema.pl mysql > mysql/schema.sql + +oracle/data.sql: $(top_srcdir)/create/bin/gen_data.pl + $(top_srcdir)/create/bin/gen_data.pl oracle > oracle/data.sql + +oracle/schema.sql: $(top_srcdir)/create/bin/gen_data.pl + $(top_srcdir)/create/bin/gen_schema.pl oracle > oracle/schema.sql + +postgresql/data.sql: $(top_srcdir)/create/bin/gen_data.pl + $(top_srcdir)/create/bin/gen_data.pl postgresql > postgresql/data.sql + +postgresql/schema.sql: $(top_srcdir)/create/bin/gen_data.pl + $(top_srcdir)/create/bin/gen_schema.pl postgresql > postgresql/schema.sql + +sqlite3/data.sql: $(top_srcdir)/create/bin/gen_data.pl + $(top_srcdir)/create/bin/gen_data.pl sqlite3 > sqlite3/data.sql + +sqlite3/schema.sql: $(top_srcdir)/create/bin/gen_data.pl + $(top_srcdir)/create/bin/gen_schema.pl sqlite3 > sqlite3/schema.sql Index: trunk/src/libs/zbxdbcache/Makefile.am =================================================================== --- trunk/src/libs/zbxdbcache/Makefile.am (revision 54454) +++ trunk/src/libs/zbxdbcache/Makefile.am (working copy) @@ -11,4 +11,6 @@ macrocache.c \ macrocache.h -libzbxdbcache_a_CFLAGS = -I@top_srcdir@/src/zabbix_server/ -I@top_srcdir@/src/libs/zbxalgo +libzbxdbcache_a_CFLAGS = \ + -I$(top_srcdir)/src/zabbix_server \ + -I$(top_srcdir)/src/libs/zbxalgo Index: trunk/src/libs/zbxdbhigh/Makefile.am =================================================================== --- trunk/src/libs/zbxdbhigh/Makefile.am (revision 54454) +++ trunk/src/libs/zbxdbhigh/Makefile.am (working copy) @@ -25,4 +25,7 @@ template_item.c \ template.h -libzbxdbhigh_a_CFLAGS = -I@top_srcdir@/src/zabbix_server/ +libzbxdbhigh_a_CFLAGS = -I$(top_srcdir)/src/zabbix_server + +discovery.c: + $(top_srcdir)/create/bin/gen_schema.pl c > discovery.c \ No newline at end of file Index: trunk/src/libs/zbxserver/Makefile.am =================================================================== --- trunk/src/libs/zbxserver/Makefile.am (revision 54454) +++ trunk/src/libs/zbxserver/Makefile.am (working copy) @@ -6,4 +6,4 @@ evalfunc.c evalfunc.h \ expression.c -libzbxserver_a_CFLAGS = -I@top_srcdir@/src/libs/zbxdbcache +libzbxserver_a_CFLAGS = -I$(top_srcdir)/src/libs/zbxdbcache Index: trunk/src/libs/zbxsysinfo/aix/Makefile.am =================================================================== --- trunk/src/libs/zbxsysinfo/aix/Makefile.am (revision 54454) +++ trunk/src/libs/zbxsysinfo/aix/Makefile.am (working copy) @@ -2,7 +2,7 @@ noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a -libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ +libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent libspecsysinfo_a_SOURCES = \ aix.c \ Index: trunk/src/libs/zbxsysinfo/freebsd/Makefile.am =================================================================== --- trunk/src/libs/zbxsysinfo/freebsd/Makefile.am (revision 54454) +++ trunk/src/libs/zbxsysinfo/freebsd/Makefile.am (working copy) @@ -2,7 +2,7 @@ noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a -libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ +libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent libspecsysinfo_a_SOURCES = \ boottime.c \ Index: trunk/src/libs/zbxsysinfo/hpux/Makefile.am =================================================================== --- trunk/src/libs/zbxsysinfo/hpux/Makefile.am (revision 54454) +++ trunk/src/libs/zbxsysinfo/hpux/Makefile.am (working copy) @@ -2,7 +2,7 @@ noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a -libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ +libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent libspecsysinfo_a_SOURCES = \ cpu.c \ Index: trunk/src/libs/zbxsysinfo/linux/Makefile.am =================================================================== --- trunk/src/libs/zbxsysinfo/linux/Makefile.am (revision 54454) +++ trunk/src/libs/zbxsysinfo/linux/Makefile.am (working copy) @@ -2,7 +2,7 @@ noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a -libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ +libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent libspecsysinfo_a_SOURCES = \ boottime.c \ Index: trunk/src/libs/zbxsysinfo/netbsd/Makefile.am =================================================================== --- trunk/src/libs/zbxsysinfo/netbsd/Makefile.am (revision 54454) +++ trunk/src/libs/zbxsysinfo/netbsd/Makefile.am (working copy) @@ -2,7 +2,7 @@ noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a -libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ +libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent libspecsysinfo_a_SOURCES = \ boottime.c \ Index: trunk/src/libs/zbxsysinfo/openbsd/Makefile.am =================================================================== --- trunk/src/libs/zbxsysinfo/openbsd/Makefile.am (revision 54454) +++ trunk/src/libs/zbxsysinfo/openbsd/Makefile.am (working copy) @@ -2,7 +2,7 @@ noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a -libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ +libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent libspecsysinfo_a_SOURCES = \ boottime.c \ Index: trunk/src/libs/zbxsysinfo/osf/Makefile.am =================================================================== --- trunk/src/libs/zbxsysinfo/osf/Makefile.am (revision 54454) +++ trunk/src/libs/zbxsysinfo/osf/Makefile.am (working copy) @@ -2,7 +2,7 @@ noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a -libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ +libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent libspecsysinfo_a_SOURCES = \ cpu.c \ Index: trunk/src/libs/zbxsysinfo/osx/Makefile.am =================================================================== --- trunk/src/libs/zbxsysinfo/osx/Makefile.am (revision 54454) +++ trunk/src/libs/zbxsysinfo/osx/Makefile.am (working copy) @@ -2,7 +2,7 @@ noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a -libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ +libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent libspecsysinfo_a_SOURCES = \ boottime.c \ Index: trunk/src/libs/zbxsysinfo/solaris/Makefile.am =================================================================== --- trunk/src/libs/zbxsysinfo/solaris/Makefile.am (revision 54454) +++ trunk/src/libs/zbxsysinfo/solaris/Makefile.am (working copy) @@ -2,7 +2,7 @@ noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a -libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ +libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent libspecsysinfo_a_SOURCES = \ boottime.c \ Index: trunk/src/libs/zbxsysinfo/unknown/Makefile.am =================================================================== --- trunk/src/libs/zbxsysinfo/unknown/Makefile.am (revision 54454) +++ trunk/src/libs/zbxsysinfo/unknown/Makefile.am (working copy) @@ -2,7 +2,7 @@ noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a -libspecsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ +libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent libspecsysinfo_a_SOURCES = \ diskio.c \ Index: trunk/src/zabbix_agent/Makefile.am =================================================================== --- trunk/src/zabbix_agent/Makefile.am (revision 54454) +++ trunk/src/zabbix_agent/Makefile.am (working copy) @@ -23,7 +23,7 @@ $(top_srcdir)/src/libs/zbxexec/libzbxexec.a \ $(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a -agents_ldadd += @AGENT_LIBS@ +agents_ldadd += $(AGENT_LIBS) sbin_PROGRAMS = \ zabbix_agent \ @@ -39,7 +39,7 @@ zabbix_agent_LDADD = $(agents_ldadd) -zabbix_agent_LDFLAGS = @AGENT_LDFLAGS@ +zabbix_agent_LDFLAGS = $(AGENT_LDFLAGS) zabbix_agentd_SOURCES = \ active.c active.h \ @@ -55,26 +55,26 @@ zabbix_agentd_LDADD = $(agents_ldadd) \ $(top_srcdir)/src/libs/zbxself/libzbxself.a -zabbix_agentd_LDFLAGS = @AGENT_LDFLAGS@ +zabbix_agentd_LDFLAGS = $(AGENT_LDFLAGS) zabbix_agentd_CFLAGS = \ -DZABBIX_DAEMON \ - -DSYSCONFDIR="\"@sysconfdir@\"" \ - -DLIBDIR="\"@libdir@\"" + -DSYSCONFDIR="\"$(sysconfdir)\"" \ + -DLIBDIR="\"$(libdir)\"" zabbix_agent_CFLAGS = \ - -DSYSCONFDIR="\"@sysconfdir@\"" \ - -DLIBDIR="\"@libdir@\"" + -DSYSCONFDIR="\"$(sysconfdir)\"" \ + -DLIBDIR="\"$(libdir)\"" AGENT_CONFIG = zabbix_agent.conf AGENTD_CONFIG = zabbix_agentd.conf -AGENT_INCLUDE_DIR = $(DESTDIR)@sysconfdir@/$(AGENT_CONFIG).d -AGENTD_INCLUDE_DIR = $(DESTDIR)@sysconfdir@/$(AGENTD_CONFIG).d -MODULES_DIR = $(DESTDIR)@libdir@ +AGENT_INCLUDE_DIR = $(DESTDIR)$(sysconfdir)/$(AGENT_CONFIG).d +AGENTD_INCLUDE_DIR = $(DESTDIR)$(sysconfdir)/$(AGENTD_CONFIG).d +MODULES_DIR = $(DESTDIR)$(libdir) install-data-hook: $(MKDIR_P) "$(AGENT_INCLUDE_DIR)" $(MKDIR_P) "$(AGENTD_INCLUDE_DIR)" $(MKDIR_P) "$(MODULES_DIR)" - test -f "$(DESTDIR)@sysconfdir@/$(AGENT_CONFIG)" || cp "../../conf/$(AGENT_CONFIG)" "$(DESTDIR)@sysconfdir@" - test -f "$(DESTDIR)@sysconfdir@/$(AGENTD_CONFIG)" || cp "../../conf/$(AGENTD_CONFIG)" "$(DESTDIR)@sysconfdir@" + test -f "$(DESTDIR)$(sysconfdir)/$(AGENT_CONFIG)" || cp "../../conf/$(AGENT_CONFIG)" "$(DESTDIR)$(sysconfdir)" + test -f "$(DESTDIR)$(sysconfdir)/$(AGENTD_CONFIG)" || cp "../../conf/$(AGENTD_CONFIG)" "$(DESTDIR)$(sysconfdir)" Index: trunk/src/zabbix_proxy/Makefile.am =================================================================== --- trunk/src/zabbix_proxy/Makefile.am (revision 54454) +++ trunk/src/zabbix_proxy/Makefile.am (working copy) @@ -54,23 +54,23 @@ $(top_srcdir)/src/libs/zbxdb/libzbxdb.a \ $(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a -zabbix_proxy_LDADD += @PROXY_LIBS@ +zabbix_proxy_LDADD += $(PROXY_LIBS) -zabbix_proxy_LDFLAGS = @PROXY_LDFLAGS@ +zabbix_proxy_LDFLAGS = $(PROXY_LDFLAGS) zabbix_proxy_CFLAGS = \ -DZABBIX_DAEMON \ - -DSYSCONFDIR="\"@sysconfdir@\"" \ - -DDATADIR="\"@datadir@\"" \ - -DLIBDIR="\"@libdir@\"" + -DSYSCONFDIR="\"$(sysconfdir)\"" \ + -DDATADIR="\"$(datadir)\"" \ + -DLIBDIR="\"$(libdir)\"" PROXY_CONFIG = zabbix_proxy.conf -INCLUDE_DIR = $(DESTDIR)@sysconfdir@/$(PROXY_CONFIG).d -EXSCRIPTS_DIR = $(DESTDIR)@datadir@/zabbix/externalscripts -MODULES_DIR = $(DESTDIR)@libdir@ +INCLUDE_DIR = $(DESTDIR)$(sysconfdir)/$(PROXY_CONFIG).d +EXSCRIPTS_DIR = $(DESTDIR)$(datadir)/zabbix/externalscripts +MODULES_DIR = $(DESTDIR)$(libdir) install-data-hook: $(MKDIR_P) "$(INCLUDE_DIR)" $(MKDIR_P) "$(EXSCRIPTS_DIR)" $(MKDIR_P) "$(MODULES_DIR)" - test -f "$(DESTDIR)@sysconfdir@/$(PROXY_CONFIG)" || cp "../../conf/$(PROXY_CONFIG)" "$(DESTDIR)@sysconfdir@" + test -f "$(DESTDIR)$(sysconfdir)/$(PROXY_CONFIG)" || cp "../../conf/$(PROXY_CONFIG)" "$(DESTDIR)$(sysconfdir)" Index: trunk/src/zabbix_server/Makefile.am =================================================================== --- trunk/src/zabbix_server/Makefile.am (revision 54454) +++ trunk/src/zabbix_server/Makefile.am (working copy) @@ -70,26 +70,26 @@ $(top_srcdir)/src/libs/zbxdb/libzbxdb.a \ $(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a -zabbix_server_LDADD += @SERVER_LIBS@ +zabbix_server_LDADD += $(SERVER_LIBS) -zabbix_server_LDFLAGS = @SERVER_LDFLAGS@ +zabbix_server_LDFLAGS = $(SERVER_LDFLAGS) zabbix_server_CFLAGS = \ -DZABBIX_DAEMON \ - -DSYSCONFDIR="\"@sysconfdir@\"" \ - -DDATADIR="\"@datadir@\"" \ - -DLIBDIR="\"@libdir@\"" \ - -I@top_srcdir@/src/libs/zbxdbcache + -DSYSCONFDIR="\"$(sysconfdir)\"" \ + -DDATADIR="\"$(datadir)\"" \ + -DLIBDIR="\"$(libdir)\"" \ + -I$(top_srcdir)/src/libs/zbxdbcache SERVER_CONFIG = zabbix_server.conf -INCLUDE_DIR = $(DESTDIR)@sysconfdir@/$(SERVER_CONFIG).d -EXSCRIPTS_DIR = $(DESTDIR)@datadir@/zabbix/externalscripts -ALSCRIPTS_DIR = $(DESTDIR)@datadir@/zabbix/alertscripts -MODULES_DIR = $(DESTDIR)@libdir@ +INCLUDE_DIR = $(DESTDIR)$(sysconfdir)/$(SERVER_CONFIG).d +EXSCRIPTS_DIR = $(DESTDIR)$(datadir)/zabbix/externalscripts +ALSCRIPTS_DIR = $(DESTDIR)$(datadir)/zabbix/alertscripts +MODULES_DIR = $(DESTDIR)$(libdir) install-data-hook: $(MKDIR_P) "$(INCLUDE_DIR)" $(MKDIR_P) "$(EXSCRIPTS_DIR)" $(MKDIR_P) "$(ALSCRIPTS_DIR)" $(MKDIR_P) "$(MODULES_DIR)" - test -f "$(DESTDIR)@sysconfdir@/$(SERVER_CONFIG)" || cp "../../conf/$(SERVER_CONFIG)" "$(DESTDIR)@sysconfdir@" + test -f "$(DESTDIR)$(sysconfdir)/$(SERVER_CONFIG)" || cp "../../conf/$(SERVER_CONFIG)" "$(DESTDIR)$(sysconfdir)" Index: trunk/src/zabbix_server/poller/Makefile.am =================================================================== --- trunk/src/zabbix_server/poller/Makefile.am (revision 54454) +++ trunk/src/zabbix_server/poller/Makefile.am (working copy) @@ -24,4 +24,6 @@ checks_calculated.c checks_calculated.h \ poller.c poller.h -libzbxpoller_a_CFLAGS = -I@top_srcdir@/src/libs/zbxsysinfo/simple -I@top_srcdir@/src/libs/zbxdbcache +libzbxpoller_a_CFLAGS = \ + -I$(top_srcdir)/src/libs/zbxsysinfo/simple \ + -I$(top_srcdir)/src/libs/zbxdbcache