diff options
| author | unknown <monty@mysql.com> | 2004-05-27 02:51:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-27 02:51:28 +0300 |
| commit | d000ea9c4db6cfb3dd2314ae66e89cc193131ffd (patch) | |
| tree | 308534bfb5e99b83732f79c04f7f5fddc8fcf998 /netware/Makefile.am | |
| parent | abd68407bf756cee304fda6d84b1e81716910fc3 (diff) | |
| parent | 1d03d1629d64801681238152800bec49c4472afd (diff) | |
| download | mariadb-git-d000ea9c4db6cfb3dd2314ae66e89cc193131ffd.tar.gz | |
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
netware/Makefile.am:
Auto merged
Diffstat (limited to 'netware/Makefile.am')
| -rw-r--r-- | netware/Makefile.am | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/netware/Makefile.am b/netware/Makefile.am index 1f0277ef20e..5ef71301574 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -14,6 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +if HAVE_NETWARE INCLUDES = -I$(srcdir)/../include -I../include -I.. bin_PROGRAMS = mysqld_safe mysql_install_db mysql_test_run libmysql mysqld_safe_SOURCES= mysqld_safe.c my_manage.c @@ -43,7 +44,30 @@ link_sources: org=`echo $$f | sed -e 's/.*\/\(.*\)/\1/g'`; \ @LN_CP_F@ $(srcdir)/$$org $(srcdir)/../$$f; \ done; - +else +EXTRA_DIST= comp_err.def init_db.sql install_test_db.ncf \ + isamchk.def isamlog.def libmysql.def libmysql.imp \ + libmysqlmain.c my_manage.c my_manage.h \ + my_print_defaults.def myisam_ftdump.def myisamchk.def \ + myisamlog.def myisampack.def mysql.def mysql.xdc \ + mysql_fix_privilege_tables.pl mysql_install.def \ + mysql_install_db.c mysql_install_db.def \ + mysql_secure_installation.pl mysql_test_run.c \ + mysql_test_run.def mysql_waitpid.def mysqladmin.def \ + mysqlbinlog.def mysqlcheck.def mysqld.def \ + mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \ + mysqlshow.def mysqltest.def pack_isam.def perror.def \ + replace.def resolve_stack_dump.def resolveip.def test_db.sql \ + BUILD/apply-patch BUILD/compile-AUTOTOOLS \ + BUILD/compile-linux-tools BUILD/compile-netware-END \ + BUILD/compile-netware-START BUILD/compile-netware-all\ + BUILD/compile-netware-debug BUILD/compile-netware-max \ + BUILD/compile-netware-max-debug BUILD/compile-netware-src \ + BUILD/compile-netware-standard BUILD/create-patch \ + BUILD/cron-build BUILD/crontab BUILD/knetware.imp \ + BUILD/mwasmnlm BUILD/mwccnlm BUILD/mwenv BUILD/mwldnlm \ + BUILD/nwbootstrap BUILD/openssl.imp BUILD/save-patch +endif # Don't update the files from bitkeeper %::SCCS/s.% |