Merge with git+ssh://pasky.or.cz/srv/git/elinks.git

Makefile.lib

@@ -43,7 +43,7 @@ DEP_FILES = $(DEP_FILES_1:%.o=%.P)
 
 DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 
-ifdef $(OBJS)
+ifdef OBJS
 -include $(DEP_FILES)
 endif
 
@@ -58,7 +58,7 @@ endif
 %.a:
 	$(call cmd,archive)
 
-ifdef $(OBJS)
+ifdef OBJS
 clean-l:
 	rm -f $(OBJS) *.a
 endif

configure.in

@@ -7,7 +7,10 @@ AC_CONFIG_AUX_DIR(config)
 PACKAGE=elinks
 VERSION=0.11.GIT
 AC_SUBST(PACKAGE)
-AC_SUBST(VERSION
+AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Package version])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Package version])
+AC_CONFIG_HEADERS(config.h)
 
 AC_PROG_MAKE_SET
 

src/mime/backend/Makefile

@@ -9,7 +9,7 @@ ifeq ($(CONFIG_MIMETYPES),yes)
 mimetypesobj = mimetypes.o
 endif
 
-OBJS = common.o default.o $(mailcapobj) $(mimetypeobj)
+OBJS = common.o default.o $(mailcapobj) $(mimetypesobj)
 
 # Do not forget to also add the .o to ../Makefile. Yes, it sucks.
 all-l: $(OBJS)