summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-11-06 09:47:03 (UTC)
committer mickeyl <mickeyl>2003-11-06 09:47:03 (UTC)
commit26ae86ca1e42b61bd0f0031b437ed90a640aa82b (patch) (side-by-side diff)
tree852147293c6f4854709514fd745085537475b7cc
parentfef41bb5d31e0292d150b9e0067b359894370fd9 (diff)
downloadopie-26ae86ca1e42b61bd0f0031b437ed90a640aa82b.zip
opie-26ae86ca1e42b61bd0f0031b437ed90a640aa82b.tar.gz
opie-26ae86ca1e42b61bd0f0031b437ed90a640aa82b.tar.bz2
work around sucky distributions
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--gen.pro3
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a7213fb..1a5af83 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,27 @@
#!/usr/bin/make -f
-export TOPDIR:=$(shell pwd)
+export TOPDIR:=$(OPIEDIR)
include $(TOPDIR)/Vars.make
ifneq ($(wildcard $(TOPDIR)/Vars.local),)
include $(TOPDIR)/Vars.local
endif
noconfig_targets := xconfig menuconfig config oldconfig randconfig \
defconfig allyesconfig allnoconfig allmodconfig \
clean-configs $(TOPDIR)/scripts/subst $(TOPDIR)/scripts/filesubst \
ipks
configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/examples/config.in
# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
# in order to have a full set of config.in files.
# .depends depends on $(TOPDIR)/.config
# everything else depends on .depends, to ensure the dependencies are
# intact.
#
# NOTE: The order in which things happen in this makefile is
# -critical-. Do not rearrange this!
all : $(TOPDIR)/.config
diff --git a/gen.pro b/gen.pro
deleted file mode 100644
index 5980051..0000000
--- a/gen.pro
+++ b/dev/null
@@ -1,3 +0,0 @@
-CONFIG += debug
-CONFIG -= release
-CONFIG -= qt3