diff --git a/common.mak b/common.mak
index 66297ef5a1cfb730616939db524593e0cadfd2da..62dddcd5cf0eb43e89681a6a83fbe0afd41457a3 100644
--- a/common.mak
+++ b/common.mak
@@ -4,7 +4,7 @@
 
 all: # make "all" default target
 
-ifeq ($(SUBDIR),)
+ifndef SUBDIR
 vpath %.c $(SRC_DIR)
 vpath %.h $(SRC_DIR)
 vpath %.S $(SRC_DIR)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3652464c7e8ae61ce310cb4f0763e89bd5b5f591..a47f04b70cf690df602519f72d0653021e8294ff 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -362,12 +362,12 @@ OBJS-$(HAVE_W32THREADS)                += w32thread.o
 
 OBJS-$(HAVE_XVMC)                      += xvmcvideo.o
 
-ifneq ($(CONFIG_SWSCALE),yes)
+ifndef CONFIG_SWSCALE
 OBJS += imgresample.o
 endif
 
 # processor-specific code
-ifeq ($(HAVE_MMX),yes)
+ifdef HAVE_MMX
 OBJS += i386/fdct_mmx.o \
         i386/cputest.o \
         i386/dsputil_mmx.o \
diff --git a/subdir.mak b/subdir.mak
index 6384d8baf88350e144af03829ed53cd1ce7e63b6..5b92f78566a8fa4e49d8bf15faa3245436d662fa 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -19,7 +19,7 @@ endif
 INCINSTDIR := $(INCDIR)/lib$(NAME)
 
 define RULES
-ifeq ($(BUILD_SHARED),yes)
+ifdef BUILD_SHARED
 all: $(SUBDIR)$(SLIBNAME)
 
 install-libs: install-lib$(NAME)-shared
@@ -32,7 +32,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
 	$(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS)
 	$(SLIB_EXTRA_CMD)
 
-ifneq ($(SUBDIR),)
+ifdef SUBDIR
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \
     $(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF))
 endif