svn commit: r215205 - projects/jbuild/usr.bin/jdirdep

[David E. O'Brien]

Author: obrien
Date: Fri Nov 12 21:46:58 2010
New Revision: 215205
URL: http://svn.freebsd.org/changeset/base/215205

Log:
  patch-gone-wild

Modified:
  projects/jbuild/usr.bin/jdirdep/Makefile.common
  projects/jbuild/usr.bin/jdirdep/jdirdep.c

Modified: projects/jbuild/usr.bin/jdirdep/Makefile.common
==============================================================================
--- projects/jbuild/usr.bin/jdirdep/Makefile.common	Fri Nov 12 21:37:10 2010	(r215204)
+++ projects/jbuild/usr.bin/jdirdep/Makefile.common	Fri Nov 12 21:46:58 2010	(r215205)
@@ -5,19 +5,19 @@ SRCS += jdirdep.c
 CFLAGS += -I${.CURDIR}/../jdirdep -DJDIRDEP
 
 .if ${PROG} == "jdirdep"
-.if defined(USE_SQLITE3)
+. if defined(USE_SQLITE3)
 CFLAGS += -DUSE_SQLITE3 -pthread
 CFLAGS += -I/usr/local/include
 SRCS += jdirdep_sqlite3.c
 LDADD += /usr/local/lib/libsqlite3.a
-.elif defined(USE_MYSQL)
+. elif defined(USE_MYSQL)
 SRCS += jdirdep_mysql.c
 MYSQL_CFLAGS != mysql_config --cflags
 MYSQL_LIBS != mysql_config --libs
 CFLAGS += -DUSE_MYSQL ${MYSQL_CFLAGS}
 LDADD += ${MYSQL_LIBS}
 LDADD += -static
-.else
-.endif
+. else
 SRCS += jdirdep_db_stub.c
+. endif
 .endif

Modified: projects/jbuild/usr.bin/jdirdep/jdirdep.c
==============================================================================
--- projects/jbuild/usr.bin/jdirdep/jdirdep.c	Fri Nov 12 21:37:10 2010	(r215204)
+++ projects/jbuild/usr.bin/jdirdep/jdirdep.c	Fri Nov 12 21:46:58 2010	(r215205)
@@ -38,6 +38,7 @@ struct march {
 	char *machine_arch;
 	TAILQ_ENTRY(march) link;
 };
+
 #ifdef NEED_INCMK
 struct incmk {
 	char *s;
@@ -45,6 +46,7 @@ struct incmk {
 	TAILQ_ENTRY(incmk) link;
 };
 #endif
+
 struct metas {
 	char *s;
 	TAILQ_ENTRY(metas) link;
@@ -1358,12 +1360,14 @@ main(int argc, char *argv[])
 		errx(1, "SUPMAC is missing from the environment");
 
 	jdirdep_supmac(p);
+
 #ifdef NEED_INCMK
 	if ((p = getenv("INCMK")) == NULL)
 		errx(1, "INCMK is missing from the environment");
 
 	jdirdep_incmk(p);
 #endif
+
 	/*
 	 * The current source relative directory is the bit after the
 	 * source top bit has been removed.